diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-18 11:33:38 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-30 09:11:53 -0400 |
| commit | 63a5b62dba190007634e1e0f2f834057b63aeafd (patch) | |
| tree | beb6d51675d43fe8303aff62a3c9272e82e67520 /src/lib/Bcfg2/Server/Plugins/Darcs.py | |
| parent | 7b9987d1835ff422e21f0b2f36c93d956192bf4b (diff) | |
| download | bcfg2-63a5b62dba190007634e1e0f2f834057b63aeafd.tar.gz bcfg2-63a5b62dba190007634e1e0f2f834057b63aeafd.tar.bz2 bcfg2-63a5b62dba190007634e1e0f2f834057b63aeafd.zip | |
added Git.Update RMI, ability to base bcfg2 VCS repo at a different directory than the repo root
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Darcs.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Darcs.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Darcs.py b/src/lib/Bcfg2/Server/Plugins/Darcs.py index 9ec8e2df3..0033e00f3 100644 --- a/src/lib/Bcfg2/Server/Plugins/Darcs.py +++ b/src/lib/Bcfg2/Server/Plugins/Darcs.py @@ -5,16 +5,14 @@ from subprocess import Popen, PIPE import Bcfg2.Server.Plugin -class Darcs(Bcfg2.Server.Plugin.Plugin, - Bcfg2.Server.Plugin.Version): +class Darcs(Bcfg2.Server.Plugin.Version): """ Darcs is a version plugin for dealing with Bcfg2 repos stored in the Darcs VCS. """ __author__ = 'bcfg-dev@mcs.anl.gov' __vcs_metadata_path__ = "_darcs" 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 Darcs plugin with darcs directory %s" % self.vcs_path) @@ -23,13 +21,13 @@ class Darcs(Bcfg2.Server.Plugin.Plugin, try: data = Popen("env LC_ALL=C darcs changes", shell=True, - cwd=self.datastore, + cwd=self.vcs_root, stdout=PIPE).stdout.readlines() revision = data[0].strip('\n') except: msg = "Failed to read darcs repository" self.logger.error(msg) - self.logger.error('Ran command "darcs changes" from directory "%s"' - % self.datastore) + self.logger.error('Ran command "darcs changes" from directory %s' % + self.vcs_root) raise Bcfg2.Server.Plugin.PluginExecutionError(msg) return revision |