commit c88c8951f41bdd6893d761b586393c3e1eba7f51
author Simon Glass <sjg@chromium.org> Fri Sep 05 19:00:14 2014 -0600
committer Simon Glass <sjg@chromium.org> Tue Sep 09 16:38:28 2014 -0600
tree 4af8efba0ca9a5ae1ea28b9a7a0d340c0a0e0631
parent ed098bb58c00ef10df2d8aadcc2ca06f4b257c3d

buildman: Set up bsettings outside the control module

Move the bsettings code back to the main buildman.py file, so we can do
something different when testing.

Signed-off-by: Simon Glass <sjg@chromium.org>

tools/buildman/buildman.py

diff --git a/tools/buildman/buildman.py b/tools/buildman/buildman.py
index 6771c86..d0afeda 100755
--- a/tools/buildman/buildman.py
+++ b/tools/buildman/buildman.py
@@ -19,6 +19,7 @@
 
 # Our modules
 import board
+import bsettings
 import builder
 import checkpatch
 import cmdline
@@ -59,5 +60,6 @@
 
 # Build selected commits for selected boards
 else:
+    bsettings.Setup(options.config_file)
     ret_code = control.DoBuildman(options, args)
     sys.exit(ret_code)

tools/buildman/control.py

diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index 213e235..c8eeb6a 100644
--- a/tools/buildman/control.py
+++ b/tools/buildman/control.py
@@ -101,7 +101,6 @@
 
     gitutil.Setup()
 
-    bsettings.Setup(options.config_file)
     options.git_dir = os.path.join(options.git, '.git')
 
     if not toolchains: