bcfg2-admin should not process any config files when help is requested

[Jon Nials <[email protected]…>]

bcfg2-admin should NOT process the Packages/config.xml if any help command is executed.

Recreate:

bcfg2-admin minestruct help

produces output and refreshes the cache. It should only do this if you actually execute a command.

[solj]

I believe that this patch should fix the problem.

diff --git a/src/lib/Server/Admin/__init__.py b/src/lib/Server/Admin/__init__.py
index b34d710..41c485d 100644
--- a/src/lib/Server/Admin/__init__.py
+++ b/src/lib/Server/Admin/__init__.py
@@ -53,9 +53,7 @@ class Mode(object):
     cfp = property(getCFP)
 
     def __call__(self, args):
-        if len(args) > 0 and args[0] == 'help':
-            print(self.__longhelp__)
-            raise SystemExit(0)
+        pass
 
     def errExit(self, emsg):
         print(emsg)
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index 36be6ab..419d223 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -62,6 +62,9 @@ def main():
 
     if args[0] in get_modes():
         modname = args[0].capitalize()
+        if args[1] == 'help':
+            print(mode_import(modname).__longhelp__)
+            raise SystemExit(0)
         try:
             mode_cls = mode_import(modname)
         except ImportError:

[solj]

Applied in 34b0e09aed52103d6b1ed2da1c2dac57b4e5c5d0.