diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-22 10:55:50 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-22 10:55:50 -0400 |
| commit | cc5328915f2faa96a24ec8dab343e6cf7e9bdefd (patch) | |
| tree | 08442d35a05262146ae89c8de19bae7512729b02 | |
| parent | 142642ae176711ffd7f63e1299c9256a5a80b008 (diff) | |
| download | bcfg2-cc5328915f2faa96a24ec8dab343e6cf7e9bdefd.tar.gz bcfg2-cc5328915f2faa96a24ec8dab343e6cf7e9bdefd.tar.bz2 bcfg2-cc5328915f2faa96a24ec8dab343e6cf7e9bdefd.zip | |
bcfg2-info builddir requires "interactive" flag
| -rwxr-xr-x | src/sbin/bcfg2-info | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index 1f41ba6b8..4dc6349a0 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -567,27 +567,26 @@ if __name__ == '__main__': optinfo = { 'configfile': Bcfg2.Options.CFILE, 'help': Bcfg2.Options.HELP, - } - optinfo.update({ - '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, - '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 - }) + '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, + '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, + 'interactive': Bcfg2.Options.INTERACTIVE, + } setup = Bcfg2.Options.OptionParser(optinfo) setup.hm = "Usage:\n %s\n%s" % (setup.buildHelpMessage(), USAGE) |