From cf6e7476a65122b71e071947e01dc7c268b0ea2f Mon Sep 17 00:00:00 2001
From: Sol Jerome <solj@ices.utexas.edu>
Date: Mon, 26 Jan 2009 20:54:03 +0000
Subject: Add Version plugin type

The following changes were made:
 * Remove VCS logic out of the Core
 * Add Git/Svn plugins
 * Remove config file directive in bcfg2.conf

Use of the plugins are enabled by adding Git or Svn (or both)
to the plugins line of bcfg2.conf

Signed-off-by: Sol Jerome <solj@ices.utexas.edu>


git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5044 ce84e21b-d406-0410-9b95-82705330c041
---
 src/lib/Server/Core.py | 50 ++++++--------------------------------------------
 1 file changed, 6 insertions(+), 44 deletions(-)

(limited to 'src/lib/Server/Core.py')

diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py
index b7a187c57..ad5573201 100644
--- a/src/lib/Server/Core.py
+++ b/src/lib/Server/Core.py
@@ -1,10 +1,6 @@
 '''Bcfg2.Server.Core provides the runtime support for bcfg2 modules'''
 __revision__ = '$Revision$'
 
-from ConfigParser import ConfigParser, NoSectionError, NoOptionError
-c = ConfigParser()
-c.read('/etc/bcfg2.conf')
-
 from time import time
 
 from Bcfg2.Server.Plugin import PluginInitError, PluginExecutionError
@@ -28,7 +24,7 @@ class CoreInitError(Exception):
 class Core(object):
     '''The Core object is the container for all Bcfg2 Server logic, and modules'''
 
-    def __init__(self, repo, plugins, password, vcs, encoding,
+    def __init__(self, repo, plugins, password, encoding,
                  filemonitor='default'):
         object.__init__(self)
         self.datastore = repo
@@ -46,14 +42,6 @@ class Core(object):
         self.revision = '-1'
         self.password = password
         self.encoding = encoding
-        try:
-            self.vcs = c.get('server', 'vcs')
-            if self.vcs == 'svn':
-                self.read_svn_revision()
-            elif self.vcs == 'git':
-                self.read_git_revision()
-        except:
-            self.vcs = 'none'
 
         if '' in plugins:
             plugins.remove('')
@@ -224,37 +212,11 @@ class Core(object):
         '''Perform periodic update tasks'''
         count = self.fam.Service()
         if count:
-            if self.vcs == 'svn':
-                self.read_svn_revision()
-            elif self.vcs == 'git':
-                self.read_git_revision()
-
-    def read_git_revision(self):
-        try:
-            data = os.popen("env LC_ALL=C git ls-remote %s" %
-                            (self.datastore)).readlines()
-            revline = [line.split('\t')[0].strip() for line in data if \
-                       line.split('\t')[1].strip() == 'refs/heads/master'][-1]
-            self.revision = revline
-        except IndexError:
-            logger.error("Failed to read git ls-remote; disabling git support")
-            logger.error('''Ran command "git ls-remote %s"''' % (self.datastore))
-            logger.error("Got output: %s" % data)
-            self.vcs = 'none'
-            
-    def read_svn_revision(self):
-        '''Read svn revision information for the bcfg2 repository'''
-        try:
-            data = os.popen("env LC_ALL=C svn info %s" \
-                            % (self.datastore)).readlines()
-            revline = [line.split(': ')[1].strip() for line in data \
-                       if line[:9] == 'Revision:'][-1]
-            self.revision = revline
-        except IndexError:
-            logger.error("Failed to read svn info; disabling svn support")
-            logger.error('''Ran command "svn info %s"''' % (self.datastore))
-            logger.error("Got output: %s" % data)
-            self.vcs = 'none'
+            for plugin in self.plugins.values():
+                if isinstance(plugin, Bcfg2.Server.Plugin.Version):
+                    self.revision = plugin.get_revision()
+                else:
+                    self.revision = -1
 
     def GetDecisions(self, metadata, mode):
         result = []
-- 
cgit v1.2.3-1-g7c22