summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Bcfg2')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Svn.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Svn.py b/src/lib/Bcfg2/Server/Plugins/Svn.py
index 2feb2f989..51f44c52d 100644
--- a/src/lib/Bcfg2/Server/Plugins/Svn.py
+++ b/src/lib/Bcfg2/Server/Plugins/Svn.py
@@ -64,10 +64,10 @@ class Svn(Bcfg2.Server.Plugin.Version):
def get_conflict_resolver(self, choice):
""" Get a PySvn conflict resolution callback """
- def callback(self, conflict_description):
+ def callback(conflict_description):
""" PySvn callback function to resolve conflicts """
- self.debug_log("Svn: Resolving conflict for %s with %s" %
- (conflict_description['path'], choice))
+ self.logger.info("Svn: Resolving conflict for %s with %s" %
+ (conflict_description['path'], choice))
return choice, None, False
return callback