Author: stsp
Date: Fri Apr 21 21:10:32 2023
New Revision: 1909337

URL: http://svn.apache.org/viewvc?rev=1909337&view=rev
Log:
* contrib/server-side/fsfsverify.py
  (NodeRev): Do not error on property lists as found in FSFS format >=4
   which added the sha1 and uniquifier fields. Previously fsfsverify.py
   would exit with a ValueError when reading such a revision.

Modified:
    subversion/trunk/contrib/server-side/fsfsverify.py

Modified: subversion/trunk/contrib/server-side/fsfsverify.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/contrib/server-side/fsfsverify.py?rev=1909337&r1=1909336&r2=1909337&view=diff
==============================================================================
--- subversion/trunk/contrib/server-side/fsfsverify.py (original)
+++ subversion/trunk/contrib/server-side/fsfsverify.py Fri Apr 21 21:10:32 2023
@@ -726,7 +726,10 @@ class NodeRev(object):
         self.text = TextRep(rev, offset, length, size, digest,
                             contentType, currentRev, self, sha1, uniquifier)
       elif field == 'props':
-        (rev, offset, length, size, digest) = value.split(' ')
+        if len(value.split(' ')) == 5:
+          (rev, offset, length, size, digest) = value.split(' ')
+        else:
+          (rev, offset, length, size, digest, sha1, uniquifier) = 
value.split(' ')
         rev = int(rev)
         offset = int(offset)
         length = int(length)


Reply via email to