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.
git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1886928 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/contrib/server-side/fsfsfixer/fixer/fix-rev.py b/contrib/server-side/fsfsfixer/fixer/fix-rev.py
index 66b395a..416a074 100755
--- a/contrib/server-side/fsfsfixer/fixer/fix-rev.py
+++ b/contrib/server-side/fsfsfixer/fixer/fix-rev.py
@@ -137,9 +137,11 @@
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]
