[Zodb-checkins] CVS: ZODB3/ZODB - MappingStorage.py:1.9.26.3

[Tim Peters]

Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv9028/ZODB

Modified Files:
      Tag: zodb33-devel-branch
	MappingStorage.py 
Log Message:
MappingStorage.store():  pass more info when raising ConflictError.
This repairs the new failure in:

    checkUnresolvable (ZEO.tests.testZEO.MappingStorageTests)


=== ZODB3/ZODB/MappingStorage.py 1.9.26.2 => 1.9.26.3 ===
--- ZODB3/ZODB/MappingStorage.py:1.9.26.2	Tue Oct 28 16:28:32 2003
+++ ZODB3/ZODB/MappingStorage.py	Thu Oct 30 22:02:45 2003
@@ -71,7 +71,9 @@
                 old = self._index[oid]
                 oserial = old[:8]
                 if serial != oserial:
-                    raise POSException.ConflictError(serials=(oserial, serial))
+                    raise POSException.ConflictError(oid=oid,
+                                                     serials=(oserial, serial),
+                                                     data=data)
 
             serial = self._serial
             self._tindex.append((oid, serial+data))