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-admin | |
| parent | 5bdcf1ce5fb01aeca47d36f5b96924182c950869 (diff) | |
| download | bcfg2-1a43d45badb0c5127b75dfef436bd45af5ed916c.tar.gz bcfg2-1a43d45badb0c5127b75dfef436bd45af5ed916c.tar.bz2 bcfg2-1a43d45badb0c5127b75dfef436bd45af5ed916c.zip | |
added option groups
Diffstat (limited to 'src/sbin/bcfg2-admin')
| -rwxr-xr-x | src/sbin/bcfg2-admin | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin index 7cc19be8f..d628debea 100755 --- a/src/sbin/bcfg2-admin +++ b/src/sbin/bcfg2-admin @@ -36,18 +36,9 @@ def create_description(): return description.getvalue() def main(): - optinfo = { - 'configfile': Bcfg2.Options.CFILE, - 'help': Bcfg2.Options.HELP, - 'verbose': Bcfg2.Options.VERBOSE, - 'repo': Bcfg2.Options.SERVER_REPOSITORY, - 'plugins': Bcfg2.Options.SERVER_PLUGINS, - 'event debug': Bcfg2.Options.DEBUG, - 'filemonitor': Bcfg2.Options.SERVER_FILEMONITOR, - 'ignore': Bcfg2.Options.SERVER_FAM_IGNORE, - 'password': Bcfg2.Options.SERVER_PASSWORD, - 'encoding': Bcfg2.Options.ENCODING, - } + optinfo = dict() + optinfo.update(CLI_COMMON_OPTIONS) + optinfo.update(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()) |