[Zope-Checkins] CVS: Packages/ZODB - fspack.py:1.8.8.10

[Tim Peters]

Update of /cvs-repository/Packages/ZODB
In directory cvs.zope.org:/tmp/cvs-serv18964/ZODB

Modified Files:
      Tag: Zope-2_7-branch
	fspack.py 
Log Message:
Collector 1581:  fspack can blow up when .fs is corrupted

Repaired three places where fspack referenced an undefined global while
*trying* to raise CorruptedError.  Added new checkCorruptionInPack()
test to verify the correct exception gets raised.


=== Packages/ZODB/fspack.py 1.8.8.9 => 1.8.8.10 ===
--- Packages/ZODB/fspack.py:1.8.8.9	Wed Jun  9 14:42:08 2004
+++ Packages/ZODB/fspack.py	Tue Nov 16 16:39:04 2004
@@ -493,7 +493,7 @@
             if tlen != th.tlen:
                 self.fail(pos, "redundant transaction length does not "
                           "match initial transaction length: %d != %d",
-                          u64(s), th.tlen)
+                          tlen, th.tlen)
             pos += 8
 
         self.packpos = pos
@@ -587,7 +587,7 @@
             if tlen != th.tlen:
                 self.fail(pos, "redundant transaction length does not "
                           "match initial transaction length: %d != %d",
-                          u64(s), th.tlen)
+                          tlen, th.tlen)
             pos += 8
 
         for pos in extra_roots:
@@ -757,7 +757,7 @@
             if tlen != th.tlen:
                 self.fail(pos, "redundant transaction length does not "
                           "match initial transaction length: %d != %d",
-                          u64(s), th.tlen)
+                          tlen, th.tlen)
             pos += 8
 
         return pos, new_pos