From 3bad1f9f646f8eaa218844a07a33292b7a0f02f6 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Dec 11 2017 17:50:46 +0000 Subject: fix race condition and missing values --- diff --git a/builder/kojid b/builder/kojid index 0953dbf..4f60a8d 100755 --- a/builder/kojid +++ b/builder/kojid @@ -868,7 +868,7 @@ class BuildTask(BaseTaskHandler): h = self.readSRPMHeader(srpm) data = koji.get_header_fields(h,['name','version','release','epoch']) data['task_id'] = self.id - if getattr(self, 'source'): + if getattr(self, 'source', False): data['source'] = self.source['source'] data['extra'] = {'url': self.source['url']} @@ -4564,13 +4564,14 @@ class BuildSRPMFromSCMTask(BaseBuildTask): brootid = broot.id log_files = glob.glob('%s/*.log' % broot.resultdir()) + source = scm.get_source() broot.expire() return {'srpm': "%s/%s" % (uploadpath, srpm_name), 'logs': ["%s/%s" % (uploadpath, os.path.basename(f)) for f in log_files], 'brootid': brootid, - 'source': scm.get_source(), + 'source': source, } class TagNotificationTask(BaseTaskHandler):