Changeset 1242 in products

Timestamp:

Aug 13, 2009 3:02:17 PM (15 years ago)

Author:

koval

Message:

@@pipeline-config form now has more precise comparison of configs (merged from plone2.1 branch)

File:

• quintagroup.transmogrifier/trunk/quintagroup/transmogrifier/configview.py (modified) (3 diffs)

quintagroup.transmogrifier/trunk/quintagroup/transmogrifier/configview.py

@@ -24 +24 @@
             expkey = ANNOKEY+'.export'
             oldconfig = self.getConfig('export')
-            if export_config and export_config != oldconfig:
+            if export_config and self._configChanged(oldconfig, export_config):
                 self.anno[expkey] = export_config
                 stat.append('updated export')
@@ -34 +34 @@
             impkey = ANNOKEY+'.import'
             oldconfig = self.getConfig('import')
-            if import_config and import_config != oldconfig:
+            if import_config and self._configChanged(oldconfig, import_config):
                 self.anno[impkey] = import_config
                 stat.append('updated import')
@@ -55 +55 @@
             return file(fname).read()
 
+    def _configChanged(self, old, new):
+        """ Compare configs with normalization of line endings.
+        """
+        if old == new:
+            return False
+        if old == new.replace('\r\n', '\n'):
+            return False
+        if old.strip() == new.replace('\r\n', '\n'):
+            return False
+        return True
+
     def isDefault(self, type_):
         key = '%s.%s' % (ANNOKEY, type_)