diff options
| author | Jason Kincl <kincljc@ornl.gov> | 2012-11-27 14:32:41 -0500 |
|---|---|---|
| committer | Jason Kincl <kincljc@ornl.gov> | 2012-11-27 14:32:41 -0500 |
| commit | 9060ce87415dd930cf9306bf61bffcb7d8e702ed (patch) | |
| tree | 4a01cec7c059820548a54a99f759f4de851f16b5 /src/lib/Bcfg2/Server/Plugins/Svn.py | |
| parent | bf98d0d2c56c00ef5b5eb71aeb03e76b41475e2b (diff) | |
| download | bcfg2-9060ce87415dd930cf9306bf61bffcb7d8e702ed.tar.gz bcfg2-9060ce87415dd930cf9306bf61bffcb7d8e702ed.tar.bz2 bcfg2-9060ce87415dd930cf9306bf61bffcb7d8e702ed.zip | |
adding svn_resolution to global namespace
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Svn.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Svn.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Svn.py b/src/lib/Bcfg2/Server/Plugins/Svn.py index a79cc3c0e..04083a970 100644 --- a/src/lib/Bcfg2/Server/Plugins/Svn.py +++ b/src/lib/Bcfg2/Server/Plugins/Svn.py @@ -36,7 +36,7 @@ class Svn(Bcfg2.Server.Plugin.Version): def callback_conflict_resolver(self, conflict_description): """PySvn callback function to resolve conflicts""" - return self.conflict_resolution_map[svn_resolution], None, False + return self.conflict_resolution_map[self.svn_resolution], None, False def __init__(self, core, datastore): Bcfg2.Server.Plugin.Version.__init__(self, core, datastore) @@ -51,7 +51,7 @@ class Svn(Bcfg2.Server.Plugin.Version): self.client = pysvn.Client() try: if self.setup.cfg.has_option("svn", "conflict_resolution"): - svn_resolution = self.setup.cfp.get("svn", + self.svn_resolution = self.setup.cfp.get("svn", "conflict_resolution") self.client.callback_conflict_resolver = self.callback_conflict_resolver except ConfigParser.NoSectionError: |