diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-11-19 13:01:59 -0500 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-11-19 13:21:16 -0500 |
commit | 8399ec79ec9c286f7371e203a3cafe52cf574ace (patch) | |
tree | 31cad59233e9799eaa075d09c2b4585dd873506e /src/lib/Bcfg2/Server | |
parent | 255046b3f3484219bbfa6646c88bbc4bbc1b5256 (diff) | |
download | bcfg2-8399ec79ec9c286f7371e203a3cafe52cf574ace.tar.gz bcfg2-8399ec79ec9c286f7371e203a3cafe52cf574ace.tar.bz2 bcfg2-8399ec79ec9c286f7371e203a3cafe52cf574ace.zip |
fixed vcs_root/vcs_path for Version plugins, esp. Svn
Diffstat (limited to 'src/lib/Bcfg2/Server')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugin/interfaces.py | 8 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Svn.py | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/interfaces.py b/src/lib/Bcfg2/Server/Plugin/interfaces.py index cba3e8145..202ec7533 100644 --- a/src/lib/Bcfg2/Server/Plugin/interfaces.py +++ b/src/lib/Bcfg2/Server/Plugin/interfaces.py @@ -517,11 +517,11 @@ class Version(Plugin): def __init__(self, core, datastore): Plugin.__init__(self, core, datastore) + if core.setup['vcs_root']: + self.vcs_root = core.setup['vcs_root'] + else: + self.vcs_root = datastore if self.__vcs_metadata_path__: - if core.setup['vcs_root']: - self.vcs_root = core.setup['vcs_root'] - else: - self.vcs_root = datastore self.vcs_path = os.path.join(self.vcs_root, self.__vcs_metadata_path__) diff --git a/src/lib/Bcfg2/Server/Plugins/Svn.py b/src/lib/Bcfg2/Server/Plugins/Svn.py index fda6b57b5..57689cf33 100644 --- a/src/lib/Bcfg2/Server/Plugins/Svn.py +++ b/src/lib/Bcfg2/Server/Plugins/Svn.py @@ -17,10 +17,9 @@ except ImportError: class Svn(Bcfg2.Server.Plugin.Version): """Svn is a version plugin for dealing with Bcfg2 repos.""" __author__ = 'bcfg-dev@mcs.anl.gov' + __vcs_metadata_path__ = ".svn" if HAS_SVN: __rmi__ = Bcfg2.Server.Plugin.Version.__rmi__ + ['Update', 'Commit'] - else: - __vcs_metadata_path__ = ".svn" def __init__(self, core, datastore): Bcfg2.Server.Plugin.Version.__init__(self, core, datastore) |