Commit 15537907 authored by Tim Peters's avatar Tim Peters

Merge rev 30988 from 3.4 branch.

Collector #1830.

In some error cases when reading a FileStorage index, the
code referenced an undefined global.
parent b1427270
...@@ -44,6 +44,9 @@ ThreadedAsync.LoopCallback ...@@ -44,6 +44,9 @@ ThreadedAsync.LoopCallback
FileStorage FileStorage
----------- -----------
- (3.5a4) Collector #1830. In some error cases when reading a FileStorage
index, the code referenced an undefined global.
- (3.5a4) Collector #1822. The ``undoLog()`` and ``undoInfo()`` methods - (3.5a4) Collector #1822. The ``undoLog()`` and ``undoInfo()`` methods
were changed in 3.4a9 to return the documented results. Alas, some pieces were changed in 3.4a9 to return the documented results. Alas, some pieces
of (non-ZODB) code relied on the actual behavior. When the ``first`` and of (non-ZODB) code relied on the actual behavior. When the ``first`` and
...@@ -66,14 +69,14 @@ BTrees interface ...@@ -66,14 +69,14 @@ BTrees interface
methods raise an exception if no key exists satsifying the constraints. methods raise an exception if no key exists satsifying the constraints.
What's new in ZODB3 3.4.1a3? What's new in ZODB3 3.4.1a4?
============================ ============================
Release date: DD-MMM-2005 Release date: DD-MMM-2005
Following are dates of internal releases (to support ongoing Zope 2 Following are dates of internal releases (to support ongoing Zope 2
development) since ZODB 3.4's last public release: development) since ZODB 3.4's last public release:
- 3.4.1a3 DD-MMM-2005 - 3.4.1a3 02-Jul-2005
- 3.4.1a2 29-Jun-2005 - 3.4.1a2 29-Jun-2005
- 3.4.1a1 27-Jun-2005 - 3.4.1a1 27-Jun-2005
...@@ -91,6 +94,9 @@ Savepoints ...@@ -91,6 +94,9 @@ Savepoints
FileStorage FileStorage
----------- -----------
- (3.4.1a3) Collector #1830. In some error cases when reading a FileStorage
index, the code referenced an undefined global.
- (3.4.1a2) Collector #1822. The ``undoLog()`` and ``undoInfo()`` methods - (3.4.1a2) Collector #1822. The ``undoLog()`` and ``undoInfo()`` methods
were changed in 3.4a9 to return the documented results. Alas, some pieces were changed in 3.4a9 to return the documented results. Alas, some pieces
of (non-ZODB) code relied on the actual behavior. When the `first` and of (non-ZODB) code relied on the actual behavior. When the `first` and
......
...@@ -1730,7 +1730,7 @@ def read_index(file, name, index, vindex, tindex, stop='\377'*8, ...@@ -1730,7 +1730,7 @@ def read_index(file, name, index, vindex, tindex, stop='\377'*8,
name, pos) name, pos)
if index_get(h.oid, 0) != h.prev: if index_get(h.oid, 0) != h.prev:
if prev: if h.prev:
if recover: if recover:
return tpos, None, None return tpos, None, None
logger.error("%s incorrect previous pointer at %s", logger.error("%s incorrect previous pointer at %s",
......
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