summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Kincl <kincljc@ornl.gov>2012-11-27 21:18:23 -0500
committerJason Kincl <kincljc@ornl.gov>2012-11-27 21:18:23 -0500
commit93bd9dd8354264b7a96b5061cf51588b687ba24e (patch)
tree706cead2a291dc3f94b8845bc8fd5c498078c1b0 /src
parent9060ce87415dd930cf9306bf61bffcb7d8e702ed (diff)
downloadbcfg2-93bd9dd8354264b7a96b5061cf51588b687ba24e.tar.gz
bcfg2-93bd9dd8354264b7a96b5061cf51588b687ba24e.tar.bz2
bcfg2-93bd9dd8354264b7a96b5061cf51588b687ba24e.zip
fixing bugs
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Svn.py11
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)