Infrastructure/distgit-bugzilla-sync
3
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

Set the qacontact info in one place to reduce code duplication

Browse source 
Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
This commit is contained in:
Pierre-Yves Chibon 2019-11-22 10:18:38 +01:00 • committed by Nils Philippsen
parent cd9696f0cb
commit 5c4a6dc32a
1 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
distgit_bugzilla_sync/script.py
View file

@ -257,18 +257,18 @@ class BugzillaProxy:
e.args = ('ProtocolError', e.errcode, e.errmsg) e.args = ('ProtocolError', e.errcode, e.errmsg)
raise raise
# Set the qacontact_email and name
if qacontact:
qacontact_email = self._get_bugzilla_email(qacontact)
else:
qacontact_email = 'extras-qa@fedoraproject.org'
qacontact = '<default: extras-qa@...>'
pkg_key = package.lower() pkg_key = package.lower()
if pkg_key in product: if pkg_key in product:
# edit the package information # edit the package information
data = {} data = {}
# Grab bugzilla email for things changable via xmlrpc
if qacontact:
qacontact_email = self._get_bugzilla_email(qacontact)
else:
qacontact_email = 'extras-qa@fedoraproject.org'
qacontact = f'<default: extras-qa@...>'
# Check for changes to the owner, qacontact, or description # Check for changes to the owner, qacontact, or description
if product[pkg_key]['initialowner'] != owner_email: if product[pkg_key]['initialowner'] != owner_email:
data['initialowner'] = owner_email data['initialowner'] = owner_email
@ -348,12 +348,6 @@ class BugzillaProxy:
raise raise
else: else:
# Add component # Add component
if qacontact:
qacontact_email = self._get_bugzilla_email(qacontact)
else:
qacontact_email = 'extras-qa@fedoraproject.org'
qacontact = f'<default: extras-qa@...>'
data = { data = {
'product': self.config['products'][collection], 'product': self.config['products'][collection],
'component': package, 'component': package,