summaryrefslogtreecommitdiffstats
path: root/src/sbin/bcfg2-server
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-03-21 14:37:27 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-03-21 14:37:27 -0400
commitc9ba92ef62376bbf01da1eac96cd5a2b5eb65a66 (patch)
tree19a61840175d2fb16ea51dedf49abd45d2417774 /src/sbin/bcfg2-server
parentf36c89f5e78a3a2fcd9ad4b38b8670895883bd38 (diff)
parente88c029c6fdbedb038443c8cbe52206d9ca9c1a2 (diff)
downloadbcfg2-c9ba92ef62376bbf01da1eac96cd5a2b5eb65a66.tar.gz
bcfg2-c9ba92ef62376bbf01da1eac96cd5a2b5eb65a66.tar.bz2
bcfg2-c9ba92ef62376bbf01da1eac96cd5a2b5eb65a66.zip
Merge branch 'maint'
Diffstat (limited to 'src/sbin/bcfg2-server')
-rwxr-xr-xsrc/sbin/bcfg2-server3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index 8322edeaa..cdca71e74 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -11,6 +11,7 @@ from Bcfg2.Server.Core import CoreInitError
LOGGER = logging.getLogger('bcfg2-server')
+
def main():
optinfo = dict()
optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS)
@@ -22,7 +23,7 @@ def main():
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'