diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-16 13:28:06 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-17 12:55:52 -0500 |
| commit | 9be9cfec322518f764be9766b27d24132fc6a66f (patch) | |
| tree | e7d1f419fe90c1ef1069446a67a7ace754df95de /src/sbin/bcfg2-server | |
| parent | 68804df4b5ccc251c788a99b5682bb9aba973cb9 (diff) | |
| download | bcfg2-9be9cfec322518f764be9766b27d24132fc6a66f.tar.gz bcfg2-9be9cfec322518f764be9766b27d24132fc6a66f.tar.bz2 bcfg2-9be9cfec322518f764be9766b27d24132fc6a66f.zip | |
added module-level OptionParser to avoid passing it as an argument or global all over
Diffstat (limited to 'src/sbin/bcfg2-server')
| -rwxr-xr-x | src/sbin/bcfg2-server | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index 8322edeaa..7e7dede30 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -16,13 +16,13 @@ def main(): optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS) optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS) optinfo.update(Bcfg2.Options.DAEMON_COMMON_OPTIONS) - setup = Bcfg2.Options.OptionParser(optinfo) + setup = Bcfg2.Options.get_option_parser(args=optinfo) setup.parse(sys.argv[1:]) # check whether the specified bcfg2.conf exists if not os.path.exists(setup['configfile']): print("Could not read %s" % setup['configfile']) sys.exit(1) - + if setup['backend'] not in ['best', 'cherrypy', 'builtin']: print("Unknown server backend %s, using 'best'" % setup['backend']) setup['backend'] = 'best' @@ -37,7 +37,7 @@ def main(): from Bcfg2.Server.BuiltinCore import Core try: - core = Core(setup) + core = Core() core.run() except CoreInitError: msg = sys.exc_info()[1] |