Commit c2ac982c authored by Jeremy Hylton's avatar Jeremy Hylton

Revert previous checkin: It doesn't work for ZEO.

parent d31fda3c
...@@ -474,12 +474,13 @@ class PackableUndoStorage(PackableStorageBase): ...@@ -474,12 +474,13 @@ class PackableUndoStorage(PackableStorageBase):
packt2 = time.time() packt2 = time.time()
db.pack(packt2) db.pack(packt2)
if isinstance(self._storage, FileStorage): # BDBStorage allows the second pack, but doesn't lose data.
# If FileStorage performed a redundant pack, it would try:
# remove the lost_oid.
self.assertRaises(StorageError, db.pack, packt1)
else:
db.pack(packt1) db.pack(packt1)
except StorageError:
pass
# This object would be removed by the second pack, even though
# it is reachable.
self._storage.load(lost_oid, "") self._storage.load(lost_oid, "")
def checkPackUndoLog(self): def checkPackUndoLog(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment