summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-09-05 19:00:11 -0600
committerSimon Glass <sjg@chromium.org>2014-09-09 16:38:27 -0600
commit48ba5856eb47dca0abc4d24e7c4e3ce1fd2628f1 (patch)
treeb4e223e0aaa3f8ef923d6e91e32676356671e570
parentd3d5c1233156215c3c793e77dce72f2fdfe745f1 (diff)
downloadu-boot-imx-48ba5856eb47dca0abc4d24e7c4e3ce1fd2628f1.zip
u-boot-imx-48ba5856eb47dca0abc4d24e7c4e3ce1fd2628f1.tar.gz
u-boot-imx-48ba5856eb47dca0abc4d24e7c4e3ce1fd2628f1.tar.bz2
buildman: Move full help code into the control module
There is no good reason to keep this code separate. Move it into control.py so it is easier to test. Signed-off-by: Simon Glass <sjg@chromium.org>
-rwxr-xr-xtools/buildman/buildman.py6
-rw-r--r--tools/buildman/control.py8
2 files changed, 8 insertions, 6 deletions
diff --git a/tools/buildman/buildman.py b/tools/buildman/buildman.py
index c4de857..70c2142 100755
--- a/tools/buildman/buildman.py
+++ b/tools/buildman/buildman.py
@@ -63,12 +63,6 @@ options, args = cmdline.ParseArgs()
# Run our meagre tests
if options.test:
RunTests()
-elif options.full_help:
- pager = os.getenv('PAGER')
- if not pager:
- pager = 'more'
- fname = os.path.join(os.path.dirname(sys.argv[0]), 'README')
- command.Run(pager, fname)
# Build selected commits for selected boards
else:
diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index 06c9229..408d9b1 100644
--- a/tools/buildman/control.py
+++ b/tools/buildman/control.py
@@ -84,6 +84,14 @@ def DoBuildman(options, args):
options: Command line options object
args: Command line arguments (list of strings)
"""
+ if options.full_help:
+ pager = os.getenv('PAGER')
+ if not pager:
+ pager = 'more'
+ fname = os.path.join(os.path.dirname(sys.argv[0]), 'README')
+ command.Run(pager, fname)
+ return 0
+
gitutil.Setup()
bsettings.Setup(options.config_file)