diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2012-08-18 13:45:12 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2012-08-18 13:45:12 -0500 |
| commit | 50e4132f0ef09fbe4e796bbc26b26b60493550a6 (patch) | |
| tree | ce7e1296198b9000bc9f32bd6a31208ff07ff171 /src/sbin | |
| parent | d238b4141273c8a59a29fef48a33d547b3968160 (diff) | |
| download | bcfg2-50e4132f0ef09fbe4e796bbc26b26b60493550a6.tar.gz bcfg2-50e4132f0ef09fbe4e796bbc26b26b60493550a6.tar.bz2 bcfg2-50e4132f0ef09fbe4e796bbc26b26b60493550a6.zip | |
bcfg2-admin: Make help message consistent
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/sbin')
| -rwxr-xr-x | src/sbin/bcfg2-admin | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin index 8790cadee..24e9eaac4 100755 --- a/src/sbin/bcfg2-admin +++ b/src/sbin/bcfg2-admin @@ -11,6 +11,7 @@ from Bcfg2.Bcfg2Py3k import StringIO log = logging.getLogger('bcfg2-admin') + def mode_import(modename): """Load Bcfg2.Server.Admin.<mode>.""" modname = modename.capitalize() @@ -18,10 +19,12 @@ def mode_import(modename): (modname)).Server.Admin, modname) return getattr(mod, modname) + def get_modes(): """Get all available modes, except for the base mode.""" return [x.lower() for x in Bcfg2.Server.Admin.__all__ if x != 'mode'] + def create_description(): """Create the description string from the list of modes.""" modes = get_modes() @@ -35,13 +38,15 @@ def create_description(): pass return description.getvalue() + def main(): optinfo = dict() optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS) optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS) setup = Bcfg2.Options.OptionParser(optinfo) # override default help message to include description of all modes - setup.hm = "%s\n%s" % (setup.buildHelpMessage(), create_description()) + setup.hm = "Usage:\n\n%s\n%s" % (setup.buildHelpMessage(), + create_description()) setup.parse(sys.argv[1:]) if setup['debug']: @@ -80,7 +85,7 @@ def main(): if hasattr(mode, 'bcore'): mode.bcore.shutdown() else: - log.error("Unknown mode %s" % setup['args'][0]) + log.error("Error: Unknown mode '%s'\n" % setup['args'][0]) print(create_description()) raise SystemExit(1) |