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

Jeremy Hylton jeremy@zope.com
Fri, 14 Mar 2003 16:56:48 -0500


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

Modified Files:
	file.py 
Log Message:
Fix some NameErrors.


=== Zope3/src/zodb/storage/file.py 1.19 => 1.20 ===
--- Zope3/src/zodb/storage/file.py:1.19	Fri Mar 14 15:45:41 2003
+++ Zope3/src/zodb/storage/file.py	Fri Mar 14 16:56:48 2003
@@ -290,7 +290,7 @@
                 # which case, we don't want to totally lose the data.
                 if not read_only:
                     warn("%s truncated, possibly due to damaged records at %s",
-                         name, pos)
+                         self._file.name, pos)
                     _truncate(self._file, self._file.name, pos)
                 break
 
@@ -316,7 +316,7 @@
                              "end of the file, possibly due to a system "
                              "crash.  %s truncated to recover from bad data "
                              "at end.", self._file.name)
-                        _truncate(file, name, pos)
+                        _truncate(file, self._file.name, pos)
                     break
                 else:
                     if recover:
@@ -337,7 +337,7 @@
                 if h != stl:
                     if recover: return tpos, None, None
                     panic('%s has inconsistent transaction length at %s',
-                          name, pos)
+                          self._file.name, pos)
                 pos = tend + 8
                 continue