[Zodb-checkins] CVS: ZODB3/BDBStorage - BDBFullStorage.py:1.71.6.3 BDBMinimalStorage.py:1.29.18.1

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/BDBStorage
In directory cvs.zope.org:/tmp/cvs-serv13588/BDBStorage

Modified Files:
      Tag: zodb33-devel-branch
	BDBFullStorage.py BDBMinimalStorage.py 
Log Message:
Change ConflictError to include the name of the object's class.


=== ZODB3/BDBStorage/BDBFullStorage.py 1.71.6.2 => 1.71.6.3 ===
--- ZODB3/BDBStorage/BDBFullStorage.py:1.71.6.2	Tue Oct 28 16:28:26 2003
+++ ZODB3/BDBStorage/BDBFullStorage.py	Thu Oct 30 15:16:55 2003
@@ -503,11 +503,13 @@
             # given in the call is not the same as the last stored serial
             # number.  First, attempt application level conflict
             # resolution, and if that fails, raise a ConflictError.
-            data = self.tryToResolveConflict(oid, oserial, serial, data)
-            if data:
+            rdata = self.tryToResolveConflict(oid, oserial, serial, data)
+            if rdata:
                 conflictresolved = True
+                data = rdata
             else:
-                raise POSException.ConflictError(serials=(oserial, serial))
+                raise POSException.ConflictError(
+                    oid=oid, serials=(oserial, serial), data=data)
         # Do we already know about this version?  If not, we need to record
         # the fact that a new version is being created.  version will be the
         # empty string when the transaction is storing on the non-version


=== ZODB3/BDBStorage/BDBMinimalStorage.py 1.29 => 1.29.18.1 ===
--- ZODB3/BDBStorage/BDBMinimalStorage.py:1.29	Thu Jan 30 18:31:24 2003
+++ ZODB3/BDBStorage/BDBMinimalStorage.py	Thu Oct 30 15:16:55 2003
@@ -269,11 +269,13 @@
             # The object exists in the database, but the serial number
             # given in the call is not the same as the last stored serial
             # number.  Raise a ConflictError.
-            data = self.tryToResolveConflict(oid, oserial, serial, data)
-            if data:
+            rdata = self.tryToResolveConflict(oid, oserial, serial, data)
+            if rdata:
                 conflictresolved = True
+                data = rdata
             else:
-                raise POSException.ConflictError(serials=(oserial, serial))
+                raise POSException.ConflictError(
+                    oid=oid, serials=(oserial, serial), data=data)
         # Optimistically write to the serials and pickles table.  Be sure
         # to also update the oids table for this object too.
         newserial = self._serial