diff options
Diffstat (limited to 'buildbot_gentoo_ci/steps/logs.py')
| -rw-r--r-- | buildbot_gentoo_ci/steps/logs.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/buildbot_gentoo_ci/steps/logs.py b/buildbot_gentoo_ci/steps/logs.py index 84f5058..f214ad6 100644 --- a/buildbot_gentoo_ci/steps/logs.py +++ b/buildbot_gentoo_ci/steps/logs.py @@ -8,7 +8,7 @@ import io import hashlib import json -from portage.versions import catpkgsplit +from portage.versions import catpkgsplit, cpv_getversion from twisted.internet import defer from twisted.python import log @@ -209,6 +209,7 @@ class MakeIssue(BuildStep): p = catpkgsplit(self.error_dict['cpv'])[1] cp = c + '/' + p word_list.append(cp) + word_list.append(cpv_getversion(self.error_dict['cpv'])) for word in self.error_dict['title_phase'].split(' '): word_list.append(word) for word in self.error_dict['title_issue_nice'].split(' '): @@ -273,16 +274,21 @@ class MakeIssue(BuildStep): emails['maintainers'] = Maintainers emails['owners'] = self.getProperty('owners') emails['packages_emails'] = [] - pmail_ids = yield self.gentooci.db.packages.getEmailsIdsByPackageUuid(self.getProperty("version_data")['package_uuid']) + if self.getProperty('failed_version_data'): + version_data = self.getProperty('failed_version_data') + else: + version_data = self.getProperty("version_data") + pmail_ids = yield self.gentooci.db.packages.getEmailsIdsByPackageUuid(version_data['package_uuid']) for pmail_id in pmail_ids: pmail = yield self.gentooci.db.packages.getEmailByEmailId(pmail_id['email_id']) - emails['packages_emails'].append(pmail['email']) - changes = yield self.master.db.changes.getChange(self.getProperty("version_data")['change_id']) + pmail_id['email'] = pmail['email'] + emails['packages_emails'].append(pmail_id) + changes = yield self.master.db.changes.getChange(version_data['change_id']) cemail = {} cemail['authors'] = changes['author'] #cemail['committer'] = changes['committer'] cemail['changes_uids_email'] = [] - changes_uids = yield self.master.db.changes.getChangeUids(self.getProperty("version_data")['change_id']) + changes_uids = yield self.master.db.changes.getChangeUids(version_data['change_id']) for changes_uid in changes_uids: cuemail = yield self.master.db.users.getUser(changes_uid) cemail['changes_uids_email'].append(cuemail['identifier']) |