diff options
| author | Sol Jerome <solj@ices.utexas.edu> | 2008-11-26 19:09:37 +0000 |
|---|---|---|
| committer | Sol Jerome <solj@ices.utexas.edu> | 2008-11-26 19:09:37 +0000 |
| commit | cd9f13d2f8a6852c4f23b7e6a5fa07b637156dbc (patch) | |
| tree | 13546c0a881169cafa732334b2ee4106f884d806 /src/sbin/bcfg2-admin | |
| parent | de73f711db795b8709b10cfb827f99001210c199 (diff) | |
| download | bcfg2-cd9f13d2f8a6852c4f23b7e6a5fa07b637156dbc.tar.gz bcfg2-cd9f13d2f8a6852c4f23b7e6a5fa07b637156dbc.tar.bz2 bcfg2-cd9f13d2f8a6852c4f23b7e6a5fa07b637156dbc.zip | |
Add bcfg2-admin option information to help message (reported by Gabe Turner) [bugfix]
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4988 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin/bcfg2-admin')
| -rwxr-xr-x | src/sbin/bcfg2-admin | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin index 71ac68efc..7ed79b4b2 100755 --- a/src/sbin/bcfg2-admin +++ b/src/sbin/bcfg2-admin @@ -17,6 +17,7 @@ def mode_import(modename): if __name__ == '__main__': Bcfg2.Logger.setup_logging('bcfg2-admin', to_console=True, level=40) + avail_opts = {'-C <configfile>': 'Set alternate bcfg2.conf location'} # Get config file path configfile = Bcfg2.Options.CFILE.default try: @@ -35,13 +36,16 @@ if __name__ == '__main__': modes.remove('mode') if len(args) < 1 or args[0] == 'help': - print ("Usage: bcfg2-admin MODE [ARGS]\n\n" - "Available modes are:") + print ("Usage: bcfg2-admin [OPTIONS] MODE [ARGS]\n\n" + "Available options are:") + for (opt, arg) in avail_opts.iteritems(): + print (" %-15s " % opt + arg) + print ("\nAvailable modes are:") if len(args) > 1: args = [args[1], args[0]] else: for mode in modes: - print (" %-12s %s" % + print (" %-15s %s" % (mode, mode_import(mode).__shorthelp__)) raise SystemExit(0) if args[0] in modes: |