From 5b8fd8cb103f31ef0d67c0fd4bbedfec0988c6af Mon Sep 17 00:00:00 2001
From: Sol Jerome <solj@ices.utexas.edu>
Date: Tue, 13 Jan 2009 20:00:16 +0000
Subject: Add support for alternate VCS backends

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5023 ce84e21b-d406-0410-9b95-82705330c041
---
 src/sbin/bcfg2-info   | 10 +++++-----
 src/sbin/bcfg2-server |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/sbin')

diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index a4c3be83b..cf369bd4d 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -1,6 +1,6 @@
 #!/usr/bin/python -i
 '''This tool loads the Bcfg2 core into an interactive debugger'''
-__revision__ = '$Revision$'
+__revision__ = '$Revision: 5014 $'
 
 import copy, logging, lxml.etree, sys, time, cmd
 import Bcfg2.Logger, Bcfg2.Server.Core, os
@@ -24,10 +24,10 @@ def printTabular(rows):
 
 class infoCore(cmd.Cmd, Bcfg2.Server.Core.Core):
 
-    def __init__(self, repo, plgs, passwd, svn, encoding, event_debug):
+    def __init__(self, repo, plgs, passwd, vcs, encoding, event_debug):
         cmd.Cmd.__init__(self)
         try:
-            Bcfg2.Server.Core.Core.__init__(self, repo, plgs, passwd, svn,
+            Bcfg2.Server.Core.Core.__init__(self, repo, plgs, passwd, vcs,
                                             encoding)
             if event_debug:
                 self.fam.debug = True
@@ -293,7 +293,7 @@ if __name__ == '__main__':
             'help': Bcfg2.Options.HELP,
               }
     optinfo.update({'repo': Bcfg2.Options.SERVER_REPOSITORY,
-                    'svn': Bcfg2.Options.SERVER_SVN,
+                    'vcs': Bcfg2.Options.SERVER_VCS,
                     'plugins': Bcfg2.Options.SERVER_PLUGINS,
                     'password': Bcfg2.Options.SERVER_PASSWORD,
                     'event debug': Bcfg2.Options.DEBUG,
@@ -302,7 +302,7 @@ if __name__ == '__main__':
     setup.parse(sys.argv[1:])
     print setup
     loop = infoCore(setup['repo'], setup['plugins'], 
-                    setup['password'], setup['svn'], setup['encoding'],
+                    setup['password'], setup['vcs'], setup['encoding'],
                     '-d' in sys.argv)
     if "args" in setup and setup['args']:
         loop.onecmd(" ".join(setup['args']))
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index 98274be4a..48619c124 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 '''The XML-RPC Bcfg2 Server'''
-__revision__ = '$Revision$'
+__revision__ = '$Revision: 5014 $'
 
 import Bcfg2.Server.Plugins.Metadata 
 
@@ -35,7 +35,7 @@ class Bcfg2Serv(Bcfg2.Component.Component):
         try:
             self.Core = Core(setup['repo'], setup['plugins'], 
                              setup['password'], 
-                             setup['svn'], setup['encoding'], setup['filemonitor'])
+                             setup['vcs'], setup['encoding'], setup['filemonitor'])
         except CoreInitError, msg:
             logger.critical("Fatal error: %s" % (msg))
             raise SystemExit, 1
@@ -197,7 +197,7 @@ if __name__ == '__main__':
         }
 
     OPTINFO.update({'repo': Bcfg2.Options.SERVER_REPOSITORY,
-                    'svn': Bcfg2.Options.SERVER_SVN,
+                    'vcs': Bcfg2.Options.SERVER_VCS,
                     'plugins': Bcfg2.Options.SERVER_PLUGINS,
                     'password': Bcfg2.Options.SERVER_PASSWORD,
                     'filemonitor': Bcfg2.Options.SERVER_FILEMONITOR,
-- 
cgit v1.2.3-1-g7c22