diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-01-10 10:58:46 -0500 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-01-10 10:59:20 -0500 |
commit | 81296e41fb0d4a056d336915103de178768d34af (patch) | |
tree | 264468e6efdc625ee8875643f1413ddf66212709 /src/sbin/bcfg2-admin | |
parent | e7dcc44c41303dd56da227adc3249751d5de0d4a (diff) | |
download | bcfg2-81296e41fb0d4a056d336915103de178768d34af.tar.gz bcfg2-81296e41fb0d4a056d336915103de178768d34af.tar.bz2 bcfg2-81296e41fb0d4a056d336915103de178768d34af.zip |
consistent help messages from bcfg2-admin/bcfg2-info (bug #1033)
Diffstat (limited to 'src/sbin/bcfg2-admin')
-rwxr-xr-x | src/sbin/bcfg2-admin | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin index 09117a3f4..386c8dd47 100755 --- a/src/sbin/bcfg2-admin +++ b/src/sbin/bcfg2-admin @@ -44,6 +44,9 @@ def main(): 'verbose': Bcfg2.Options.VERBOSE, } setup = Bcfg2.Options.OptionParser(optinfo) + # override default help message to include description of all modes + setup.hm = "Usage:\n %s\n%s" % (setup.buildHelpMessage(), + create_description()) setup.parse(sys.argv[1:]) log_args = dict(to_syslog=False, to_console=logging.WARNING) @@ -58,8 +61,7 @@ def main(): setup['args'] = [setup['args'][1], setup['args'][0]] else: # Print short help for all modes - print("Usage:\n %s" % setup.buildHelpMessage()) - print(create_description()) + print(setup.hm) raise SystemExit(0) if setup['args'][0] in get_modes(): |