summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2009-02-19 22:18:42 +0000
committerSol Jerome <solj@ices.utexas.edu>2009-02-19 22:18:42 +0000
commitd7ebfb7eb67c29350b3f5c67b301b8d6503d9831 (patch)
tree979cc1c6f5e0dd5ac4da0e91508ed6f3b12590b7
parentc1ab07e738d4c0ea24428ffb9f8cab44527eee8e (diff)
downloadbcfg2-d7ebfb7eb67c29350b3f5c67b301b8d6503d9831.tar.gz
bcfg2-d7ebfb7eb67c29350b3f5c67b301b8d6503d9831.tar.bz2
bcfg2-d7ebfb7eb67c29350b3f5c67b301b8d6503d9831.zip
Remove old vcs option
Signed-off-by: Sol Jerome <solj@ices.utexas.edu> git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5085 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Options.py4
-rwxr-xr-xsrc/sbin/bcfg2-server1
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,