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

[Jeremy Hylton]

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

Modified Files:
      Tag: opaque-pickles-branch
	file.py 
Log Message:
Fix unqualified references to oid and version from header.


=== Zope3/src/zodb/storage/file.py 1.8.4.6 => 1.8.4.7 ===
--- Zope3/src/zodb/storage/file.py:1.8.4.6	Mon Mar 10 18:33:43 2003
+++ Zope3/src/zodb/storage/file.py	Tue Mar 11 15:17:47 2003
@@ -1692,7 +1692,7 @@
                 h = self._read_data_header(pos)
                 dlen = h.recordlen()
                 if h.version:
-                    if packing and pindex.get(oid, 0) != pos:
+                    if packing and pindex.get(h.oid, 0) != pos:
                         # This is not the most current record, or the
                         # oid is no longer referenced so skip it.
                         pos += dlen
@@ -1799,7 +1799,7 @@
                             pnv -= offset
                         ofile.write(p64(pnv))
                     ofile.write(pv)
-                    ofile.write(version)
+                    ofile.write(h.version)
                 ofile.write(refsdata)
                 ofile.write(p)