svn commit: r1886928 - /subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py

[ju...@apache.org]

Author: julianfoad
Date: Thu Feb 25 17:16:00 2021
New Revision: 1886928

URL: http://svn.apache.org/viewvc?rev=1886928&view=rev
Log:
Update 'fsfsfixer' to work with svnadmin verify versions 1.9+.

An extra line was added on stderr in svnadmin verify 1.9:
  "* Error verifying revision <REV>."

* contrib/server-side/fsfsfixer/fixer/fix-rev.py
  (handle_one_error): Skip the extra line.

Modified:
    subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py

Modified: subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py?rev=1886928&r1=1886927&r2=1886928&view=diff
==============================================================================
--- subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py (original)
+++ subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py Thu Feb 25 17:16:00 2021
@@ -137,9 +137,11 @@ def handle_one_error(repo_dir, rev, erro
   for line in error_lines:
     verbose_print(line)
 
-  match = re.match(r"svn.*: Filesystem is corrupt", error_lines[0])
-  if match:
-    # This is an additional line in v1.7+ error messages: skip it.
+  # Skip uninteresting lines
+  #   svnadmin 1.9+: r"\* Error verifying revision .*"
+  #   svnadmin 1.7+: r"svn.*: Filesystem is corrupt"
+  while (re.match(r"\* Error verifying revision .*", error_lines[0]) or
+         re.match(r"svn.*: Filesystem is corrupt", error_lines[0])):
     error_lines = error_lines[1:]
 
   line1 = error_lines[0]