diff options
| -rwxr-xr-x | src/sbin/bcfg2 | 2 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-admin | 4 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-lint | 6 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-reports | 1 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2 index e3af04ec5..d27e601b6 100755 --- a/src/sbin/bcfg2 +++ b/src/sbin/bcfg2 @@ -63,7 +63,7 @@ class Client: serverCN=Bcfg2.Options.CLIENT_SCNS, timeout=Bcfg2.Options.CLIENT_TIMEOUT, decision_list=Bcfg2.Options.CLIENT_DECISION_LIST) - optinfo.update(CLI_COMMON_OPTIONS) + optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS) self.setup = Bcfg2.Options.OptionParser(optinfo) self.setup.parse(sys.argv[1:]) diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin index d628debea..33f84cd91 100755 --- a/src/sbin/bcfg2-admin +++ b/src/sbin/bcfg2-admin @@ -37,8 +37,8 @@ def create_description(): def main(): optinfo = dict() - optinfo.update(CLI_COMMON_OPTIONS) - optinfo.update(SERVER_COMMON_OPTIONS) + 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()) diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint index 5368c4b93..4b1fa8686 100755 --- a/src/sbin/bcfg2-lint +++ b/src/sbin/bcfg2-lint @@ -69,12 +69,12 @@ def load_server(setup): return core if __name__ == '__main__': - optinto = dict(config=Bcfg2.Options.LINT_CONFIG, + optinfo = dict(config=Bcfg2.Options.LINT_CONFIG, showerrors=Bcfg2.Options.LINT_SHOW_ERRORS, stdin=Bcfg2.Options.LINT_FILES_ON_STDIN, schema=Bcfg2.Options.SCHEMA_PATH) - optinfo.update(CLI_COMMON_OPTIONS) - optinfo.update(SERVER_COMMON_OPTIONS) + optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS) + optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS) setup = Bcfg2.Options.OptionParser(optinfo) setup.parse(sys.argv[1:]) diff --git a/src/sbin/bcfg2-reports b/src/sbin/bcfg2-reports index 1f101b9a7..b393f0534 100755 --- a/src/sbin/bcfg2-reports +++ b/src/sbin/bcfg2-reports @@ -3,6 +3,7 @@ import os import sys +from Bcfg2.Bcfg2Py3k import ConfigParser try: import Bcfg2.Server.Reports.settings |