diff options
| author | Jason Kincl <kincljc@ornl.gov> | 2012-11-27 21:40:26 -0500 |
|---|---|---|
| committer | Jason Kincl <kincljc@ornl.gov> | 2012-11-27 21:40:26 -0500 |
| commit | 6d0ac6ce0deab13e5cc395b4655a2cd94cef9d9f (patch) | |
| tree | e50a2d65ee559625627fa13e3d8f6bf6f77a9032 /src/lib/Bcfg2/Server/Plugins/Svn.py | |
| parent | eefa08eaac8e45963321bd55291a81a579db2cb1 (diff) | |
| download | bcfg2-6d0ac6ce0deab13e5cc395b4655a2cd94cef9d9f.tar.gz bcfg2-6d0ac6ce0deab13e5cc395b4655a2cd94cef9d9f.tar.bz2 bcfg2-6d0ac6ce0deab13e5cc395b4655a2cd94cef9d9f.zip | |
log actions better
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Svn.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Svn.py | 3 |
1 files changed, 3 insertions, 0 deletions
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): |