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

[Jeremy Hylton]

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

Modified Files:
	file.py 
Log Message:
Booboo.  Conflict resolution just changed its interface.


=== Zope3/src/zodb/storage/file.py 1.3 => 1.4 ===
--- Zope3/src/zodb/storage/file.py:1.3	Tue Dec 31 17:42:45 2002
+++ Zope3/src/zodb/storage/file.py	Wed Jan 15 17:08:52 2003
@@ -1023,7 +1023,13 @@
         except KeyError:
             # couldn't find oid; what's the real explanation for this?
             raise UndoError(oid, "_loadBack() failed")
-        data = self.tryToResolveConflict(oid, cserial, serial, bdata, cdata)
+        try:
+            data = self.tryToResolveConflict(oid, cserial, serial, bdata,
+                                             cdata)
+        except interfaces.ConflictError:
+            raise UndoError(oid,
+                            "Some data were modified by a later transaction")
+            
 
         if data:
             return data, 0, version, snv, ipos