[Zodb-checkins] CVS: StandaloneZODB/ZODB - FileStorage.py:1.75.16.5

[Jeremy Hylton]

Update of /cvs-repository/StandaloneZODB/ZODB
In directory cvs.zope.org:/tmp/cvs-serv13107

Modified Files:
      Tag: StandaloneZODB-1_0-branch
	FileStorage.py 
Log Message:
Include oid of object in ConflictError on store().


=== StandaloneZODB/ZODB/FileStorage.py 1.75.16.4 => 1.75.16.5 ===
                     data=self.tryToResolveConflict(oid, oserial, serial, data)
                     if not data:
-                        raise POSException.ConflictError(
-                            serials=(oserial, serial))
+                        raise POSException.ConflictError(object=oid,
+                                                serials=(oserial, serial))
             else:
                 oserial=serial