[Zope-Checkins] CVS: Packages/ZODB - FileStorage.py:1.135.6.9.2.1

Jim Fulton jim at zope.com
Fri Jan 20 17:15:21 EST 2006


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

Modified Files:
      Tag: jim-test-storage
	FileStorage.py 
Log Message:
Don't read a saved index if we are reading as of a given time.


=== Packages/ZODB/FileStorage.py 1.135.6.9 => 1.135.6.9.2.1 ===
--- Packages/ZODB/FileStorage.py:1.135.6.9	Tue Jun 14 16:46:32 2005
+++ Packages/ZODB/FileStorage.py	Fri Jan 20 17:15:21 2006
@@ -218,9 +218,6 @@
         elif stop is not None:
             raise ValueError, "time-travel is only supported in read-only mode"
 
-        if stop is None:
-            stop='\377'*8
-
         # Lock the database and set up the temp file.
         if not read_only:
             # Create the lock file
@@ -265,7 +262,12 @@
             self._file = open(file_name, 'w+b')
             self._file.write(packed_version)
 
-        r = self._restore_index()
+        if stop is None:
+            r = self._restore_index()
+            stop='\377'*8
+        else:
+            r = None
+            
         if r is not None:
             self._used_index = 1 # Marker for testing
             index, vindex, start, ltid = r



More information about the Zope-Checkins mailing list