[Zodb-checkins] CVS: Packages/bsddb3Storage - Full.py:1.16

barry@digicool.com barry@digicool.com
Mon, 16 Apr 2001 16:54:05 -0400 (EDT)


Update of /cvs-repository/Packages/bsddb3Storage
In directory korak:/tmp/cvs-serv16623

Modified Files:
	Full.py 
Log Message:
transactionalUndo(): Un-Python-2.1-ification; can't use continue in a
try clause. :(



--- Updated File Full.py in package Packages/bsddb3Storage --
--- Full.py	2001/04/16 20:23:48	1.15
+++ Full.py	2001/04/16 20:54:05	1.16
@@ -647,16 +647,16 @@
                         # zombification record
                         if not mrec or mrec[0][:8] <> oid:
                             newrevs.append((oid, vid+nvrevid+DNE+revid))
-                            continue
                         # BAW: If the revid of this object record is the same
                         # as the revid we're being asked to undo, then I think
                         # we have a problem (since the storage invariant is
                         # that it doesn't retain metadata records for multiple
                         # modifications of the object in the same txn).
-                        if mrec[0][8:] == revid:
+                        elif mrec[0][8:] == revid:
                             raise StorageSystemError
                         # All is good, so just restore this metadata record
-                        newrevs.append((oid, mrec[1]))
+                        else:
+                            newrevs.append((oid, mrec[1]))
                     finally:
                         mdc.close()
                 else: