summaryrefslogtreecommitdiffstats
path: root/src/lib/Options.py
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2009-01-13 20:00:16 +0000
committerSol Jerome <solj@ices.utexas.edu>2009-01-13 20:00:16 +0000
commit5b8fd8cb103f31ef0d67c0fd4bbedfec0988c6af (patch)
tree42156b849284060c18d5e19b893473b4375dca7a /src/lib/Options.py
parent95e0e4207468efc253aabe0d36dfb816aac59653 (diff)
downloadbcfg2-5b8fd8cb103f31ef0d67c0fd4bbedfec0988c6af.tar.gz
bcfg2-5b8fd8cb103f31ef0d67c0fd4bbedfec0988c6af.tar.bz2
bcfg2-5b8fd8cb103f31ef0d67c0fd4bbedfec0988c6af.zip
Add support for alternate VCS backends
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5023 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Options.py')
-rw-r--r--src/lib/Options.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/Options.py b/src/lib/Options.py
index 0933b61cf..fd31fa05b 100644
--- a/src/lib/Options.py
+++ b/src/lib/Options.py
@@ -1,5 +1,5 @@
'''Option parsing library for utilities'''
-__revision__ = '$Revision$'
+__revision__ = '$Revision: 5000 $'
import getopt, os, socket, sys, ConfigParser, Bcfg2.Client.Tools
@@ -127,7 +127,7 @@ class OptionSet(dict):
def buildHelpMessage(self):
if hasattr(self, 'hm'):
return self.hm
- return ''.join([opt.buildHelpMessage() for opt in self.values()])
+ return ' '.join([opt.buildHelpMessage() for opt in self.values()])
def helpExit(self, msg='', code=1):
if msg:
@@ -177,7 +177,8 @@ 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_SVN = Option('Server svn support', False, cf=('server', 'svn'))
+SERVER_VCS = Option('Server vcs support', cf=('server', 'vcs'),
+ default='default')
SERVER_PLUGINS = Option('Server plugin list', cf=('server', 'plugins'),
default=[], cook=list_split)
SERVER_GENERATORS = Option('Server generator list', cf=('server', 'generators'),