diff options
| -rw-r--r-- | src/lib/Options.py | 4 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-server | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/Options.py b/src/lib/Options.py index 3953effee..2cdc5fcae 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -132,7 +132,7 @@ class OptionSet(dict): def helpExit(self, msg='', code=1): if msg: print msg - print "Usage: %s" % self.buildHelpMessage() + print "Usage:\n %s" % self.buildHelpMessage() raise SystemExit(code) def parse(self, argv, do_getopt=True): @@ -177,8 +177,6 @@ DAEMON = Option("Daemonize process, storing pid", False, SERVER_REPOSITORY = Option('Server repository path', '/var/lib/bcfg2', cf=('server', 'repository'), cmd='-Q', odesc='<repository path>' ) -SERVER_VCS = Option('Server vcs support', cf=('server', 'vcs'), - default='default') SERVER_PLUGINS = Option('Server plugin list', cf=('server', 'plugins'), # default server plugins default=[ diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index e75579376..791f6a1bd 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -197,7 +197,6 @@ if __name__ == '__main__': } OPTINFO.update({'repo': Bcfg2.Options.SERVER_REPOSITORY, - 'vcs': Bcfg2.Options.SERVER_VCS, 'plugins': Bcfg2.Options.SERVER_PLUGINS, 'password': Bcfg2.Options.SERVER_PASSWORD, 'filemonitor': Bcfg2.Options.SERVER_FILEMONITOR, |