summaryrefslogtreecommitdiffstats
path: root/src/sbin
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-05-07 12:19:51 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-05-07 12:19:51 +0000
commit5b415888ffc2dfd8a85f38f09fd64edd49ef5a71 (patch)
tree241a81c0a2bf86927e4f43d6bdeb6f222b9a5739 /src/sbin
parent61ae42bb686b3abde33f80591992e3adff0f155c (diff)
downloadbcfg2-5b415888ffc2dfd8a85f38f09fd64edd49ef5a71.tar.gz
bcfg2-5b415888ffc2dfd8a85f38f09fd64edd49ef5a71.tar.bz2
bcfg2-5b415888ffc2dfd8a85f38f09fd64edd49ef5a71.zip
Handle import errors in the help path (Resolves Ticket #653)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5210 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin')
-rwxr-xr-xsrc/sbin/bcfg2-admin7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index af461dfbc..3c33058f7 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -49,8 +49,11 @@ if __name__ == '__main__':
args = [args[1], args[0]]
else:
for mode in modes:
- print((" %-15s %s" %
- (mode, mode_import(mode).__shorthelp__)))
+ try:
+ print((" %-15s %s" %
+ (mode, mode_import(mode).__shorthelp__)))
+ except ImportError:
+ continue
raise SystemExit(0)
if args[0] in modes:
modname = args[0].capitalize()