fix raise_fault condition in taskWaitResults()

This commit is contained in:
Mike McLean 2017-01-11 16:55:08 -05:00
parent 5a5be59433
commit 4cd548e6dc
2 changed files with 4 additions and 1 deletions

View file

@ -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)

View file

@ -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