diff options
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Fossil.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Fossil.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Fossil.py b/src/lib/Bcfg2/Server/Plugins/Fossil.py index 85d0f38f5..f6735df12 100644 --- a/src/lib/Bcfg2/Server/Plugins/Fossil.py +++ b/src/lib/Bcfg2/Server/Plugins/Fossil.py @@ -5,16 +5,14 @@ from subprocess import Popen, PIPE import Bcfg2.Server.Plugin -class Fossil(Bcfg2.Server.Plugin.Plugin, - Bcfg2.Server.Plugin.Version): +class Fossil(Bcfg2.Server.Plugin.Version): """ 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) - Bcfg2.Server.Plugin.Version.__init__(self, datastore) + Bcfg2.Server.Plugin.Version.__init__(self, core, datastore) self.logger.debug("Initialized Fossil plugin with fossil directory %s" % self.vcs_path) @@ -23,7 +21,7 @@ class Fossil(Bcfg2.Server.Plugin.Plugin, try: data = Popen("env LC_ALL=C fossil info", shell=True, - cwd=self.datastore, + cwd=self.vcs_root, stdout=PIPE).stdout.readlines() revline = [line.split(': ')[1].strip() for line in data if \ line.split(': ')[0].strip() == 'checkout'][-1] @@ -32,5 +30,5 @@ class Fossil(Bcfg2.Server.Plugin.Plugin, msg = "Failed to read fossil info" self.logger.error(msg) self.logger.error('Ran command "fossil info" from directory "%s"' % - self.datastore) + self.vcs_root) raise Bcfg2.Server.Plugin.PluginExecutionError(msg) |