diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-12-05 07:06:29 -0600 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-12-05 07:06:29 -0600 |
| commit | 4dcd236efc95718475615da9d054e3e3ed7f128c (patch) | |
| tree | 7f6f22a0717ee322a528122d274a4d74af12882e /src/lib/Bcfg2/Server/Plugins/Svn.py | |
| parent | f5c2e1f64b90b59716c835c10b0ffef510eb33df (diff) | |
| download | bcfg2-4dcd236efc95718475615da9d054e3e3ed7f128c.tar.gz bcfg2-4dcd236efc95718475615da9d054e3e3ed7f128c.tar.bz2 bcfg2-4dcd236efc95718475615da9d054e3e3ed7f128c.zip | |
Svn: fixed conflict resolution callback, log level
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Svn.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Svn.py | 6 |
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 |