From 34b0e09aed52103d6b1ed2da1c2dac57b4e5c5d0 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Wed, 29 Jun 2011 20:12:47 -0500 Subject: bcfg2-admin: Fix traceback when help argument omitted Signed-off-by: Sol Jerome --- src/lib/Server/Admin/__init__.py | 4 +--- src/sbin/bcfg2-admin | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/lib/Server/Admin/__init__.py b/src/lib/Server/Admin/__init__.py index b34d7108c..41c485d6c 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 36be6ab14..1434afd97 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 len(args) == 1 or args[1] == 'help': + print(mode_import(modname).__longhelp__) + raise SystemExit(0) try: mode_cls = mode_import(modname) except ImportError: -- cgit v1.2.3-1-g7c22