[Zodb-checkins] CVS: Zope2/lib/python/ZODB - FileStorage.py:1.56

jeremy@digicool.com jeremy@digicool.com
Wed, 2 May 2001 17:22:38 -0400 (EDT)


Update of /cvs-repository/Zope2/lib/python/ZODB
In directory korak:/tmp/cvs-serv21816

Modified Files:
	FileStorage.py 
Log Message:
Fix order of return values from _undoDataInfo().

The cdata and cver had been swapped, causing all undos to fail,
because the version was compared to a pickle.




--- Updated File FileStorage.py in package Zope2/lib/python/ZODB --
--- FileStorage.py	2001/05/02 20:47:37	1.55
+++ FileStorage.py	2001/05/02 21:22:37	1.56
@@ -904,7 +904,7 @@
         if tipos != pos:
             # Eek, a later transaction modified the data, but,
             # maybe it is pointing at the same data we are.
-            cserial, cdataptr, cver, cdata = self._undoDataInfo(
+            cserial, cdataptr, cdata, cver = self._undoDataInfo(
                 oid, ipos, tpos)
             # Versions of undone record and current record *must* match!
             if cver != version: