diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-21 15:19:03 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-21 15:19:03 -0400 |
| commit | 1a43d45badb0c5127b75dfef436bd45af5ed916c (patch) | |
| tree | b8de6ab35e2275cae17ce6e89c3c7087b997c237 /src/sbin/bcfg2-info | |
| parent | 5bdcf1ce5fb01aeca47d36f5b96924182c950869 (diff) | |
| download | bcfg2-1a43d45badb0c5127b75dfef436bd45af5ed916c.tar.gz bcfg2-1a43d45badb0c5127b75dfef436bd45af5ed916c.tar.bz2 bcfg2-1a43d45badb0c5127b75dfef436bd45af5ed916c.zip | |
added option groups
Diffstat (limited to 'src/sbin/bcfg2-info')
| -rwxr-xr-x | src/sbin/bcfg2-info | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index c9772ce6c..08c185368 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -642,29 +642,10 @@ class infoCore(cmd.Cmd, Bcfg2.Server.Core.Core): if __name__ == '__main__': Bcfg2.Logger.setup_logging('bcfg2-info', to_syslog=False) - optinfo = { - 'configfile': Bcfg2.Options.CFILE, - 'help': Bcfg2.Options.HELP, - 'event debug': Bcfg2.Options.DEBUG, - 'profile': Bcfg2.Options.CORE_PROFILE, - 'encoding': Bcfg2.Options.ENCODING, - # Server options - 'repo': Bcfg2.Options.SERVER_REPOSITORY, - 'plugins': Bcfg2.Options.SERVER_PLUGINS, - 'password': Bcfg2.Options.SERVER_PASSWORD, - 'mconnect': Bcfg2.Options.SERVER_MCONNECT, - 'filemonitor': Bcfg2.Options.SERVER_FILEMONITOR, - 'ignore': Bcfg2.Options.SERVER_FAM_IGNORE, - 'location': Bcfg2.Options.SERVER_LOCATION, - 'static': Bcfg2.Options.SERVER_STATIC, - 'key': Bcfg2.Options.SERVER_KEY, - 'cert': Bcfg2.Options.SERVER_CERT, - 'ca': Bcfg2.Options.SERVER_CA, - 'password': Bcfg2.Options.SERVER_PASSWORD, - 'protocol': Bcfg2.Options.SERVER_PROTOCOL, - # More options - 'logging': Bcfg2.Options.LOGGING_FILE_PATH - } + optinfo = dict(profile=Bcfg2.Options.CORE_PROFILE, + mconnect=Bcfg2.Options.SERVER_MCONNECT) + optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS) + optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS) setup = Bcfg2.Options.OptionParser(optinfo) setup.hm = "Usage:\n %s\n%s" % (setup.buildHelpMessage(), USAGE) @@ -677,14 +658,14 @@ if __name__ == '__main__': prof = profile.Profile() loop = prof.runcall(infoCore, setup['repo'], setup['plugins'], setup['password'], setup['encoding'], - setup['event debug'], setup['filemonitor'], + setup['debug'], setup['filemonitor'], setup) displayTrace(prof) else: if setup['profile']: print("Profiling functionality not available.") loop = infoCore(setup['repo'], setup['plugins'], setup['password'], - setup['encoding'], setup['event debug'], + setup['encoding'], setup['debug'], setup['filemonitor'], setup) loop.Run(setup['args']) |