From 28183b9d3fc97e4990b804c55dafee8dc99be51f Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 2 Nov 2016 10:23:42 -0400 Subject: [PATCH] Fix an error in the KojiBuilder. The issue is that _get_task_by_artifact returns either None or a dict of info and we weren't handling that correctly. My mistake. --- module_build_service/builder.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/module_build_service/builder.py b/module_build_service/builder.py index 490da982..3aeb4ce0 100644 --- a/module_build_service/builder.py +++ b/module_build_service/builder.py @@ -579,11 +579,10 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules # Skip existing builds task_info = self._get_task_by_artifact(artifact_name) - task_id = task_info['task_id'] - if task_id: + if task_info: log.info("skipping build of %s. Build already exists (task_id=%s), via %s" % ( - source, task_id, self)) - return task_id, koji.BUILD_STATES['COMPLETE'], 'Build already exists.', task_info['nvr'] + source, task_info['task_id'], self)) + return task_info['task_id'], koji.BUILD_STATES['COMPLETE'], 'Build already exists.', task_info['nvr'] self._koji_whitelist_packages([artifact_name,]) if '://' not in source: