compare-puppet-catalogs: fix small bugs

lavagetto · lavagetto · commit b88fba8de197 · 2014-05-21T11:30:36.000+02:00
- Fixed the bug that swapped new and old resources missing.
- Fixed the line numbering in diffs.
- Now we output a reminder of the index url when it gets updated.
- Will do a minor version bump

Change-Id: Ie238b78444a4e20751093e2d693d5f534679175d
Signed-off-by: Giuseppe Lavagetto &lt;glavagetto@wikimedia.org&gt;
diff --git a/compare-puppet-catalogs/puppet_compare/diff2html.py b/compare-puppet-catalogs/puppet_compare/diff2html.py
@@ -312,12 +312,12 @@ def add_line(s1, s2):
         res['line2'] = ''
         s2 = ""
 
-    return ('diffline', res)
     if s1 != "":
         line1 += 1
     if s2 != "":
         line2 += 1
 
+    return ('diffline', res)
 
 def empty_buffer(output):
     global buf
diff --git a/compare-puppet-catalogs/puppet_compare/generator.py b/compare-puppet-catalogs/puppet_compare/generator.py
@@ -165,13 +165,14 @@ def on_node_compiled(self, msg):
         node = msg['data'][0][0]
         self.count += 1
         if not self.count % 5:
-            log.info('Updating index.html')
             self.update_index()
-        log.info("Nodes: %s OK %s DIFF %s FAIL" % (
+            log.info('Index updated, you can see detailed progress for your work at %s/%s', self.host, self.html_path)
+        log.info(
+            "Nodes: %s OK %s DIFF %s FAIL",
             len(self.nodelist['OK']),
             len(self.nodelist['DIFF']),
             len(self.nodelist['ERROR'])
-        ))
+        )
 
     def node_output(self, node):
         if node in self.nodelist['ERROR']:
diff --git a/compare-puppet-catalogs/puppet_compare/parser.py b/compare-puppet-catalogs/puppet_compare/parser.py
@@ -7,11 +7,6 @@
 
 log = logging.getLogger('puppet_compare')
 
-
-def contains(haystack, needle):
-    return (haystack.find(needle) >= 0)
-
-
 class DiffParser(object):
 
     def __init__(self, filename, nodename):
@@ -31,9 +26,9 @@ def run(self):
                 new_content)
 
         if self._diffs['only_in_old']:
-            self._get_diffs('old_missing', [], self._diffs['only_in_old'])
+            self._get_diffs('missing_in_new', self._diffs['only_in_old'], [])
         if self._diffs['only_in_new']:
-            self._get_diffs('new_missing', self._diffs['only_in_new'], [])
+            self._get_diffs('missing_in_old', [], self._diffs['only_in_new'])
 
         return self.results
 
