diff options
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Fossil.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Fossil.py | 45 |
1 files changed, 15 insertions, 30 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Fossil.py b/src/lib/Bcfg2/Server/Plugins/Fossil.py index 1b1627688..85d0f38f5 100644 --- a/src/lib/Bcfg2/Server/Plugins/Fossil.py +++ b/src/lib/Bcfg2/Server/Plugins/Fossil.py @@ -1,37 +1,22 @@ -import os +""" The Fossil plugin provides a revision interface for Bcfg2 repos +using fossil.""" + from subprocess import Popen, PIPE import Bcfg2.Server.Plugin -# for debugging output only -import logging -logger = logging.getLogger('Bcfg2.Plugins.Fossil') class Fossil(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.Version): - """Fossil is a version plugin for dealing with Bcfg2 repos.""" - name = 'Fossil' + """ The Fossil plugin provides a revision interface for Bcfg2 + repos using fossil. """ __author__ = 'bcfg-dev@mcs.anl.gov' + __vcs_metadata_path__ = "_FOSSIL_" def __init__(self, core, datastore): Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore) - self.core = core - self.datastore = datastore - - # path to fossil file for bcfg2 repo - fossil_file = "%s/_FOSSIL_" % datastore - - # Read revision from bcfg2 repo - if os.path.isfile(fossil_file): - revision = self.get_revision() - elif not os.path.isdir(datastore): - logger.error("%s is not a directory" % datastore) - raise Bcfg2.Server.Plugin.PluginInitError - else: - logger.error("%s is not a file" % fossil_file) - raise Bcfg2.Server.Plugin.PluginInitError - - logger.debug("Initialized Fossil.py plugin with %(ffile)s at revision %(frev)s" \ - % {'ffile': fossil_file, 'frev': revision}) + Bcfg2.Server.Plugin.Version.__init__(self, datastore) + self.logger.debug("Initialized Fossil plugin with fossil directory %s" + % self.vcs_path) def get_revision(self): """Read fossil revision information for the Bcfg2 repository.""" @@ -42,10 +27,10 @@ class Fossil(Bcfg2.Server.Plugin.Plugin, stdout=PIPE).stdout.readlines() revline = [line.split(': ')[1].strip() for line in data if \ line.split(': ')[0].strip() == 'checkout'][-1] - revision = revline.split(' ')[0] + return revline.split(' ')[0] except IndexError: - logger.error("Failed to read fossil info; disabling fossil support") - logger.error('''Ran command "fossil info" from directory "%s"''' % (self.datastore)) - logger.error("Got output: %s" % data) - raise Bcfg2.Server.Plugin.PluginInitError - return revision + msg = "Failed to read fossil info" + self.logger.error(msg) + self.logger.error('Ran command "fossil info" from directory "%s"' % + self.datastore) + raise Bcfg2.Server.Plugin.PluginExecutionError(msg) |