hack wallet scan rename job

1 files changed, 15 insertions, 15 deletions

diff --git a/parsers/survex.py b/parsers/survex.py
index 4ee5f0e..0d13c4d 100644
--- a/parsers/survex.py
+++ b/parsers/survex.py
@@ -1781,7 +1781,7 @@ class LoadingSurvex:
 
         # this is a python generator idiom.
         # see https://realpython.com/introduction-to-python-generators/
-        # this is the first use of generators in troggle (Oct.2022) and save 21 MB of memory
+        # this is the first use of generators in troggle (Oct.2022) and saves 21 MB of memory
         with open(collatefilename, "r") as fcollate:
             for svxline in fcollate:
                 self.lineno += 1
@@ -1789,22 +1789,22 @@ class LoadingSurvex:
                 if comment:
                     # this catches the ;|*include NEWFILE and ;|*edulcni ENDOFFILE lines too
                     self.LoadSurvexComment(survexblock, comment)
+                else:
+                    # detect a merge failure inserted by version control
+                    mfail = self.rx_badmerge.match(sline)
+                    if mfail:
+                        message = f"\n ! - ERROR version control merge failure\n   - '{sline}'\n"
+                        message = (
+                            message + f"   - line {self.lineno} in {blkid} in {survexblock}\n   - NERD++ needed to fix it"
+                        )
+                        print(message)
+                        print(message, file=sys.stderr)
+                        stash_data_issue(parser="survex", message=message)
+                        continue  # skip this line
 
                 if not sline:
                     continue  # skip blank lines
 
-                # detect a merge failure inserted by version control
-                mfail = self.rx_badmerge.match(sline)
-                if mfail:
-                    message = f"\n ! - ERROR version control merge failure\n   - '{sline}'\n"
-                    message = (
-                        message + f"   - line {self.lineno} in {blkid} in {survexblock}\n   - NERD++ needed to fix it"
-                    )
-                    print(message)
-                    print(message, file=sys.stderr)
-                    stash_data_issue(parser="survex", message=message)
-                    continue  # skip this line
-
                 # detect a star command
                 star = self.rx_star.match(sline)
                 if star:
@@ -1829,7 +1829,7 @@ class LoadingSurvex:
             mfail = self.rx_badmerge.match(svxline)
             if mfail:
                 message = f"\n!! - ERROR version control merge failure\n   - '{svxline}'\n"
-                message = message + f"   - in '{path}' at line {thissvxline}\n"
+                message = message + f"   - in '{path}' at line {self.lineno}\n"
                 message = (
                     message + f"   - line {self.lineno}  {survexblock}\n   - Parsing aborted. NERD++ needed to fix it"
                 )
@@ -1963,7 +1963,7 @@ class LoadingSurvex:
             stash_data_issue(parser="survex", message=message, url=None, sb=(path))
             return  # skip this survex file and all things *included in it
         except:
-            message = f"    ! ERROR *include file '{path}' in '{survexblock}' has unexpected error on opening file. OMITTED!"
+            message = f"    ! ERROR *include file '{path}' in '{survexblock}' has unexpected error on opening or reading file. OMITTED!"
             print(message)
             print(message, file=sys.stderr)
             stash_data_issue(parser="survex", message=message, url=None, sb=(path))