From 2b7712f826c6f8a73ff087c83082124782a73aa4 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 22 Nov 2019 16:26:28 +0100 Subject: [PATCH] make default QA contact email address configurable Signed-off-by: Nils Philippsen --- .../default-config-files/configuration.toml | 1 + distgit_bugzilla_sync/script.py | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/distgit_bugzilla_sync/default-config-files/configuration.toml b/distgit_bugzilla_sync/default-config-files/configuration.toml index 4272204..4649b51 100644 --- a/distgit_bugzilla_sync/default-config-files/configuration.toml +++ b/distgit_bugzilla_sync/default-config-files/configuration.toml @@ -1,5 +1,6 @@ environment = "staging" data_cache = "/var/tmp/pagure_sync_bz.json" +default_qa_contact_email = "extras-qa@fedoraproject.org" bz_maintainer_change_comment = """ This package has changed maintainer in the Fedora. Reassigning to the new maintainer of this component. diff --git a/distgit_bugzilla_sync/script.py b/distgit_bugzilla_sync/script.py index 10fe942..712f6a8 100644 --- a/distgit_bugzilla_sync/script.py +++ b/distgit_bugzilla_sync/script.py @@ -308,11 +308,13 @@ class BugzillaProxy: raise # Set the qacontact_email and name + default_qa_contact_email = self.config['default_qa_contact_email'] + default_qa_contact = f"" if qacontact: qacontact_email = self._get_bugzilla_email(qacontact) else: - qacontact_email = 'extras-qa@fedoraproject.org' - qacontact = '' + qacontact = default_qa_contact + qacontact_email = default_qa_contact_email pkg_key = package.lower() if pkg_key in product: @@ -368,8 +370,8 @@ class BugzillaProxy: for email in product[pkg_key][key]: if email in self.inverted_user_cache: from_fas_names.append(self.inverted_user_cache[email]) - elif email == 'extras-qa@fedoraproject.org': - from_fas_names.append("") + elif email == default_qa_contact_email: + from_fas_names.append(default_qa_contact) if from_fas_names: if len(from_fas_names) < len(product[pkg_key][key]): x = len(product[pkg_key][key]) - len(from_fas_names)