[Zodb-checkins] CVS: ZODB3/BDBStorage - BDBFullStorage.py:1.44.4.8.4.1

[Jeremy Hylton]

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

Modified Files:
      Tag: Zope-2_6-branch
	BDBFullStorage.py 
Log Message:
Port bug fixes from 3.2 land.


=== ZODB3/BDBStorage/BDBFullStorage.py 1.44.4.8 => 1.44.4.8.4.1 ===
--- ZODB3/BDBStorage/BDBFullStorage.py:1.44.4.8	Tue Jul 29 18:04:12 2003
+++ ZODB3/BDBStorage/BDBFullStorage.py	Fri Sep 12 17:09:23 2003
@@ -337,7 +337,13 @@
                 revid = oid+tid
                 vid = self._metadata[revid][:8]
                 self._metadata.delete(revid, txn=txn)
-                self._pickles.delete(revid, txn=txn)
+                # If the transaction performed an operation that did not
+                # write a new pickle, e.g. a version operation or undo,
+                # there will be metadate but no pickle.
+                try:
+                    self._pickles.delete(revid, txn=txn)
+                except db.DBNotFoundError:
+                    pass
                 # Clean up the object revisions table
                 try:
                     cr.set(oid+tid)