From 6bdd8fe006bcda288e1976dedf9aa5cb284416dc Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Sep 19 2017 15:40:39 +0000 Subject: avoid using "fail_fast" as a named parameter --- diff --git a/builder/kojid b/builder/kojid index 96d473e..258949a 100755 --- a/builder/kojid +++ b/builder/kojid @@ -889,10 +889,12 @@ class BuildTask(BaseTaskHandler): #scratch builds do not get imported build_id = self.session.host.initBuild(data) #(initBuild raises an exception if there is a conflict) + failany = (self.opts.get('fail_fast', False) + or not getattr(self.options, 'build_arch_can_fail', False)) try: self.extra_information = { "src": src, "data": data, "target": target } srpm,rpms,brmap,logs = self.runBuilds(srpm, build_tag, archlist, - repo_info['id'], fail_fast=self.opts.get('fail_fast')) + repo_info['id'], failany=failany) if opts.get('scratch'): #scratch builds do not get imported @@ -1035,7 +1037,7 @@ class BuildTask(BaseTaskHandler): return 'noarch' - def runBuilds(self, srpm, build_tag, archlist, repo_id, fail_fast=False): + def runBuilds(self, srpm, build_tag, archlist, repo_id, failany=True): self.logger.debug("Spawning jobs for arches: %r" % (archlist)) subtasks = {} keep_srpm = True @@ -1052,7 +1054,6 @@ class BuildTask(BaseTaskHandler): self.logger.debug("Waiting on subtasks...") # wait for subtasks to finish - failany = fail_fast or not getattr(self.options, 'build_arch_can_fail', False) results = self.wait(subtasks.values(), all=True, failany=failany) # finalize import