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/Cvs.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/Cvs.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cvs.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cvs.py b/src/lib/Bcfg2/Server/Plugins/Cvs.py index a36a116f5..ba1559a1a 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cvs.py +++ b/src/lib/Bcfg2/Server/Plugins/Cvs.py @@ -5,17 +5,15 @@ from subprocess import Popen, PIPE import Bcfg2.Server.Plugin -class Cvs(Bcfg2.Server.Plugin.Plugin, - Bcfg2.Server.Plugin.Version): +class Cvs(Bcfg2.Server.Plugin.Version): """ The Cvs plugin provides a revision interface for Bcfg2 repos using cvs.""" __author__ = 'bcfg-dev@mcs.anl.gov' __vcs_metadata_path__ = "CVSROOT" def __init__(self, core, datastore): - Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore) - Bcfg2.Server.Plugin.Version.__init__(self, datastore) - self.logger.debug("Initialized cvs plugin with cvs directory %s" % + Bcfg2.Server.Plugin.Version.__init__(self, core, datastore) + self.logger.debug("Initialized cvs plugin with CVS directory %s" % self.vcs_path) def get_revision(self): @@ -23,11 +21,12 @@ class Cvs(Bcfg2.Server.Plugin.Plugin, try: data = Popen("env LC_ALL=C cvs log", shell=True, - cwd=self.datastore, + cwd=self.vcs_root, stdout=PIPE).stdout.readlines() return data[3].strip('\n') except IndexError: - msg = "Failed to read cvs log" + msg = "Failed to read CVS log" self.logger.error(msg) - self.logger.error('Ran command "cvs log %s"' % self.datastore) + self.logger.error('Ran command "cvs log" from directory %s' % + self.vcs_root) raise Bcfg2.Server.Plugin.PluginExecutionError(msg) |