From 4cd548e6dc416fb5ba595e38007e7bc62f00545f Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Wed, 11 Jan 2017 16:55:08 -0500 Subject: [PATCH] fix raise_fault condition in taskWaitResults() --- builder/kojid | 1 + hub/kojihub.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/builder/kojid b/builder/kojid index 5ab105c0..13491bab 100755 --- a/builder/kojid +++ b/builder/kojid @@ -2413,6 +2413,7 @@ class BuildLiveMediaTask(BuildImageTask): label='livemedia %s' % arch, arch=arch) if arch in opts.get('optional_arches', []): canfail.append(subtasks[arch]) + self.logger.debug("Tasks that can fail: %r", canfail) self.logger.debug("Got image subtasks: %r", subtasks) diff --git a/hub/kojihub.py b/hub/kojihub.py index 929d4f13..521442d6 100644 --- a/hub/kojihub.py +++ b/hub/kojihub.py @@ -11098,6 +11098,8 @@ class Host(object): return [finished, unfinished] def taskWaitResults(self, parent, tasks, canfail=None): + if canfail is None: + canfail = [] results = {} # If we're getting results, we're done waiting self.taskUnwait(parent) @@ -11121,7 +11123,7 @@ class Host(object): results = [] for task_id in tasks: task = Task(task_id) - raise_fault = (task in canfail) + raise_fault = (task_id not in canfail) results.append([task_id, task.getResult(raise_fault=raise_fault)]) return results