commit c7643c16a670937e144fd01b15c58e35d1bbb097
author Simon Glass <sjg@chromium.org> Wed Jul 19 17:48:32 2023 -0600
committer Simon Glass <sjg@chromium.org> Mon Jul 24 09:34:10 2023 -0600
tree d0545b409af16266ed07d2a03bfa97eedceadae7
parent af0e29fe82415ed1d619bedd2ae0560c199f29a9

buildman: Move full-help processing to main

This does not need any of the control features. Move it out of main to
reduce the size of the do_buildman() function.

For Python 3.6 the -H feature will not work, but this does not seem to be
a huge problem, as it dates from 2016.

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

tools/buildman/control.py

diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index c4be1ad..2e4ba0b 100644
--- a/tools/buildman/control.py
+++ b/tools/buildman/control.py
@@ -8,11 +8,6 @@
 """
 
 import multiprocessing
-try:
-    import importlib.resources
-except ImportError:
-    # for Python 3.6
-    import importlib_resources
 import os
 import shutil
 import sys
@@ -26,7 +21,6 @@
 from patman import patchstream
 from u_boot_pylib import command
 from u_boot_pylib import terminal
-from u_boot_pylib import tools
 from u_boot_pylib.terminal import tprint
 
 TEST_BUILDER = None
@@ -177,11 +171,6 @@
     # Used so testing can obtain the builder: pylint: disable=W0603
     global TEST_BUILDER
 
-    if options.full_help:
-        with importlib.resources.path('buildman', 'README.rst') as readme:
-            tools.print_full_help(str(readme))
-        return 0
-
     gitutil.setup()
     col = terminal.Color()
 

tools/buildman/main.py

diff --git a/tools/buildman/main.py b/tools/buildman/main.py
index d9ad836..9a1d599 100755
--- a/tools/buildman/main.py
+++ b/tools/buildman/main.py
@@ -6,6 +6,11 @@
 
 """See README for more information"""
 
+try:
+    from importlib.resources import files
+except ImportError:
+    # for Python 3.6
+    import importlib_resources
 import os
 import sys
 
@@ -19,6 +24,7 @@
 from buildman import cmdline
 from buildman import control
 from u_boot_pylib import test_util
+from u_boot_pylib import tools
 
 def run_tests(skip_net_tests, debug, verbose, args):
     """Run the buildman tests
@@ -64,6 +70,9 @@
         return run_tests(options.skip_net_tests, options.debug, options.verbose,
                          args)
 
+    elif options.full_help:
+        tools.print_full_help(str(files('buildman').joinpath('README.rst')))
+
     # Build selected commits for selected boards
     else:
         bsettings.Setup(options.config_file)