From 6d0ac6ce0deab13e5cc395b4655a2cd94cef9d9f Mon Sep 17 00:00:00 2001 From: Jason Kincl Date: Tue, 27 Nov 2012 21:40:26 -0500 Subject: log actions better --- src/lib/Bcfg2/Server/Plugins/Svn.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/lib/Bcfg2/Server/Plugins/Svn.py') diff --git a/src/lib/Bcfg2/Server/Plugins/Svn.py b/src/lib/Bcfg2/Server/Plugins/Svn.py index a3a149b1f..d444b6a0c 100644 --- a/src/lib/Bcfg2/Server/Plugins/Svn.py +++ b/src/lib/Bcfg2/Server/Plugins/Svn.py @@ -36,6 +36,9 @@ class Svn(Bcfg2.Server.Plugin.Version): def callback_conflict_resolver(self, conflict_description): """PySvn callback function to resolve conflicts""" + self.logger.info("Svn: Resolving conflict for %s with %s" % \ + (conflict_description['path'], + self.svn_resolution) return self.conflict_resolution_map[self.svn_resolution], None, False def __init__(self, core, datastore): -- cgit v1.2.3-1-g7c22