[Zope3-checkins] CVS: Zope3/src/zodb/storage/file - main.py:1.1.2.3

Jeremy Hylton jeremy@zope.com
Mon, 21 Apr 2003 19:07:05 -0400


Update of /cvs-repository/Zope3/src/zodb/storage/file
In directory cvs.zope.org:/tmp/cvs-serv3076

Modified Files:
      Tag: jeremy-new-pack-branch
	main.py 
Log Message:
Remove some code that checks for status == "u", which no longer
exists.


=== Zope3/src/zodb/storage/file/main.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/storage/file/main.py:1.1.2.2	Mon Apr 21 19:05:56 2003
+++ Zope3/src/zodb/storage/file/main.py	Mon Apr 21 19:07:05 2003
@@ -1059,7 +1059,7 @@
                      self._file.name, pos)
                 break
 
-            if status not in ' up':
+            if status not in ' p':
                 warn('%s has invalid status, %s, at %s', self._file.name,
                      status, pos)
 
@@ -1091,16 +1091,6 @@
 
             tpos = pos
             tend = tpos+tl
-
-            if status == 'u':
-                # Undone transaction, skip it
-                seek(tend)
-                l = u64(read(8))
-                if l != stl:
-                    panic('%s has inconsistent transaction length at %s',
-                          self._file.name, pos)
-                pos = tend+8
-                continue
 
             pos = tpos+(TRANS_HDR_LEN+ul+dl+el)
             # user and description are utf-8 encoded strings