summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Kincl <kincljc@ornl.gov>2012-11-27 21:45:09 -0500
committerJason Kincl <kincljc@ornl.gov>2012-11-27 21:45:09 -0500
commit10105b311788549bbc6136884bb3e6133d86b1b3 (patch)
tree1ee51af00e4e2cded97c409c10d57c29a8cd1d31
parent6d0ac6ce0deab13e5cc395b4655a2cd94cef9d9f (diff)
downloadbcfg2-10105b311788549bbc6136884bb3e6133d86b1b3.tar.gz
bcfg2-10105b311788549bbc6136884bb3e6133d86b1b3.tar.bz2
bcfg2-10105b311788549bbc6136884bb3e6133d86b1b3.zip
fixing syntax
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Svn.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Svn.py b/src/lib/Bcfg2/Server/Plugins/Svn.py
index d444b6a0c..9ec334dd0 100644
--- a/src/lib/Bcfg2/Server/Plugins/Svn.py
+++ b/src/lib/Bcfg2/Server/Plugins/Svn.py
@@ -38,7 +38,7 @@ class Svn(Bcfg2.Server.Plugin.Version):
"""PySvn callback function to resolve conflicts"""
self.logger.info("Svn: Resolving conflict for %s with %s" % \
(conflict_description['path'],
- self.svn_resolution)
+ self.svn_resolution))
return self.conflict_resolution_map[self.svn_resolution], None, False
def __init__(self, core, datastore):