Make emails dict for bugreports

Signed-off-by: Magnus Granberg <zorry@gentoo.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/buildbot_gentoo_ci/config/schedulers.py b/buildbot_gentoo_ci/config/schedulers.py
index c34d714..a4180cc 100644
--- a/buildbot_gentoo_ci/config/schedulers.py
+++ b/buildbot_gentoo_ci/config/schedulers.py
@@ -40,19 +40,20 @@ def getGitChanges(props):
     change_data['timestamp'] = k['when_timestamp']
     change_data['branch'] = k['branch']
     change_data['project'] = k['project']
+    change_data['change_id'] = k['changeid']
     return change_data
 
 def bb_branch_fn(branch):
     # check branch
     print(f"Branch: {branch}")
-    if branch.endswith('-mr') or branch.endswith('-pr') or branch == 'master':
+    if branch.endswith('-mr') or branch.endswith('-pr') or branch.endswith('master') or branch.endswith('main'):
         return True
     return False
 
 def bb_category_fn(category):
     # check event
     print(f"Category: {category}")
-    if category == 'push' or category == 'merge_request':
+    if category == 'push' or category == 'merge_request' or category is None:
         return True
     return False