diff options
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Svn.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Svn.py b/src/lib/Bcfg2/Server/Plugins/Svn.py index 04083a970..9fe3fd398 100644 --- a/src/lib/Bcfg2/Server/Plugins/Svn.py +++ b/src/lib/Bcfg2/Server/Plugins/Svn.py @@ -50,17 +50,18 @@ class Svn(Bcfg2.Server.Plugin.Version): else: self.client = pysvn.Client() try: - if self.setup.cfg.has_option("svn", "conflict_resolution"): - self.svn_resolution = self.setup.cfp.get("svn", + if self.core.setup.cfg.has_option("svn", "conflict_resolution"): + self.svn_resolution = self.core.setup.cfp.get("svn", "conflict_resolution") - self.client.callback_conflict_resolver = self.callback_conflict_resolver + self.client.callback_conflict_resolver = \ + self.callback_conflict_resolver except ConfigParser.NoSectionError: msg = "Svn: No [svn] section found in bcfg2.conf" - LOGGER.warning(msg) + self.logger.warning(msg) except ConfigParser.NoOptionError: msg = "Svn: Option not found in bcfg2.conf: %s" % \ sys.exc_info()[1] - LOGGER.warning(msg) + self.logger.warning(msg) self.logger.debug("Initialized svn plugin with SVN directory %s" % self.vcs_path) |