From 81296e41fb0d4a056d336915103de178768d34af Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 10 Jan 2012 10:58:46 -0500 Subject: consistent help messages from bcfg2-admin/bcfg2-info (bug #1033) --- src/sbin/bcfg2-admin | 6 ++++-- src/sbin/bcfg2-info | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src') 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(): diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index 4412c712a..983677f72 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -518,9 +518,12 @@ if __name__ == '__main__': 'logging': Bcfg2.Options.LOGGING_FILE_PATH }) setup = Bcfg2.Options.OptionParser(optinfo) + setup.hm = "Usage:\n %s\n%s" % (setup.buildHelpMessage(), + USAGE) + setup.parse(sys.argv[1:]) if setup['args'] and setup['args'][0] == 'help': - print(USAGE) + print(setup.hm) sys.exit(0) elif setup['profile'] and have_profile: prof = profile.Profile() -- cgit v1.2.3-1-g7c22