From 63781bd65e70719dbab9f2f5bbe8aac7b8e0f13e Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 18 Sep 2016 16:48:36 -0600 Subject: [PATCH] buildman: Drop the 'active' flag in the builder This serves no real purpose, since when we are not active, we exit. Drop it. Signed-off-by: Simon Glass --- tools/buildman/builder.py | 7 ------- tools/buildman/builderthread.py | 10 +--------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index 44d1cfa517..5addbca44e 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -127,7 +127,6 @@ class Builder: """Class for building U-Boot for a particular commit. Public members: (many should ->private) - active: True if the builder is active and has not been stopped already_done: Number of builds already completed base_dir: Base directory to use for builder checkout: True to check out source, False to skip that step. @@ -235,7 +234,6 @@ class Builder: self.base_dir = base_dir self._working_dir = os.path.join(base_dir, '.bm-work') self.threads = [] - self.active = True self.do_make = self.Make self.gnu_make = gnu_make self.checkout = checkout @@ -390,11 +388,6 @@ class Builder: if result: target = result.brd.target - if result.return_code < 0: - self.active = False - command.StopAll() - return - self.upto += 1 if result.return_code != 0: self.fail += 1 diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index c512d3b521..af4d15a5b4 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -473,14 +473,6 @@ class BuilderThread(threading.Thread): alive = True while True: job = self.builder.queue.get() - if self.builder.active and alive: + if alive: self.RunJob(job) - ''' - try: - if self.builder.active and alive: - self.RunJob(job) - except Exception as err: - alive = False - print err - ''' self.builder.queue.task_done() -- 2.39.2