[Zope-Checkins] CVS: ZODB3/BDBStorage - BDBFullStorage.py:1.70

Barry Warsaw barry@wooz.org
Tue, 8 Apr 2003 15:25:52 -0400


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

Modified Files:
	BDBFullStorage.py 
Log Message:
_doabort(): Watch out for a missing pickle revision, which may be the
case if we're aborting e.g. a transactional undo.


=== ZODB3/BDBStorage/BDBFullStorage.py 1.69 => 1.70 ===
--- ZODB3/BDBStorage/BDBFullStorage.py:1.69	Tue Apr  1 11:02:18 2003
+++ ZODB3/BDBStorage/BDBFullStorage.py	Tue Apr  8 15:25:52 2003
@@ -338,7 +338,10 @@
                 revid = oid+tid
                 vid = self._metadata[revid][:8]
                 self._metadata.delete(revid, txn=txn)
-                self._pickles.delete(revid, txn=txn)
+                try:
+                    self._pickles.delete(revid, txn=txn)
+                except db.DBNotFoundError:
+                    pass
                 # Clean up the object revisions table
                 try:
                     cr.set(oid+tid)