From 326758e87df02ec0f87ec4c20427373a926bf2b0 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Fri, 15 Jan 2016 12:09:03 +0100 Subject: [PATCH] Return reference as not list. In case of failure return logs Signed-off-by: Petr Hracek --- hotness/consumers.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/hotness/consumers.py b/hotness/consumers.py index aa7e191..b412f90 100644 --- a/hotness/consumers.py +++ b/hotness/consumers.py @@ -260,15 +260,21 @@ def _handle_anitya_update(self, upstream, package, msg): result_rh, rh_stuff = self.buildsys.rebase_helper(package, upstream, tmp, bz) if int(result_rh) == 0: self.log.info('Rebase package %s to %s was SUCCESSFULL' % (package, version)) - for number, reference in six.iteritems(rh_stuff['build_logs'],): - note = 'Scratch build completed. %s' % '\n'.join(reference) - self.bugzilla.follow_up(note, bz) + if 'build_ref' in rh_stuff['build_logs']: + for reference in six.iteritems(rh_stuff['build_logs']['build_ref']): + note = 'Scratch build completed. %s' % '\n'.join(reference) + self.bugzilla.follow_up(note, bz) else: self.log.info('Rebase package %s to %s FAILED. See for details' % (package, version)) self.bugzilla.follow_up('Rebase package %s to %s FAILED' % (package, version), bz) - for number, reference in six.iteritems(rh_stuff['build_logs']): - note = 'Scratch build failed. %s' % '\n'.join(reference) - self.bugzilla.follow_up(note, bz) + if 'build_ref' in rh_stuff['build_logs']: + for reference in six.iteritems(rh_stuff['build_logs']['build_ref']): + note = 'Scratch build failed. %s' % '\n'.join(reference) + self.bugzilla.follow_up(note, bz) + if 'logs' in rh_stuff['build_logs']: + for log in six.iteritems(rh_stuff['build_logs']['logs']): + note = 'Build log %s . %s' % os.path.basename(log) + self.bugzilla.attach_patch(log, note, bz) for patch in rh_stuff['patches']: self.bugzilla.follow_up(patch, bz)