Mercurial > hg > drupalISMI

changeset 45:277ea02906f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update for changes in log format.
author casties
date Fri, 09 Dec 2016 12:24:21 +0100
parents 4692e90215eb
children f3945ef1e6a4
files importFromOpenMind/importer/check_ismi_log.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/importFromOpenMind/importer/check_ismi_log.py	Thu Dec 08 20:41:33 2016 +0100
+++ b/importFromOpenMind/importer/check_ismi_log.py	Fri Dec 09 12:24:21 2016 +0100
@@ -306,7 +306,7 @@
                 deleteCtx = parseStart(line)
                 
                 if deleting > 1:
-                    log("ERROR", "Concurrent delete (%s) in #%s of %s"%(saving, linecnt, line))
+                    log("ERROR", "Concurrent delete (%s) in #%s of %s"%(deleting, linecnt, line))
                     # TODO: what now?
                     break
                     
@@ -314,7 +314,7 @@
                 if '* START save previous' in line:
                     savingPrev += 1
 
-                elif '* End ...save previous' in line:
+                elif '* END ...save previous' in line or '* End ...save previous' in line:
                     if deleting > 0 and savingPrev > 0:
                         # this should be the end of the save prev from deleting
                         deleting -= 1
@@ -322,7 +322,7 @@
                     
                     savingPrev -= 1
                     
-                    if saving < 0:
+                    if savingPrev < 0:
                         log("ERROR", "Too many END save previous!")
                 
                 elif 'save previous' in line: