You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2014/01/02 23:42:28 UTC
svn commit: r1554945 -
/subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py
Author: julianfoad
Date: Thu Jan 2 22:42:28 2014
New Revision: 1554945
URL: http://svn.apache.org/r1554945
Log:
Update 'fsfsfixer' to work with svnadmin v1.7+.
* contrib/server-side/fsfsfixer/fixer/fix-rev.py
(handle_one_error): Ignore the extra error message shown by svnadmin v1.7+.
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=1554945&r1=1554944&r2=1554945&view=diff
==============================================================================
--- subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py (original)
+++ subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py Thu Jan 2 22:42:28 2014
@@ -125,6 +125,11 @@ def handle_one_error(repo_dir, rev, erro
"""If ERROR_LINES describes an error we know how to fix, then fix it.
Return True if fixed, False if not fixed."""
+ 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.
+ error_lines = error_lines[1:]
+
line1 = error_lines[0]
match = re.match(r"svn.*: Corrupt node-revision '(.*)'", line1)