Commit 95cb9170 authored by Jeremy Hylton's avatar Jeremy Hylton

Fix order of return values from _undoDataInfo().

The cdata and cver had been swapped, causing all undos to fail,
because the version was compared to a pickle.
parent 32bad8be
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
# may have a back pointer to a version record or to a non-version # may have a back pointer to a version record or to a non-version
# record. # record.
# #
__version__='$Revision: 1.55 $'[11:-2] __version__='$Revision: 1.56 $'[11:-2]
import struct, time, os, bpthread, string, base64, sys import struct, time, os, bpthread, string, base64, sys
from struct import pack, unpack from struct import pack, unpack
...@@ -904,7 +904,7 @@ class FileStorage(BaseStorage.BaseStorage, ...@@ -904,7 +904,7 @@ class FileStorage(BaseStorage.BaseStorage,
if tipos != pos: if tipos != pos:
# Eek, a later transaction modified the data, but, # Eek, a later transaction modified the data, but,
# maybe it is pointing at the same data we are. # maybe it is pointing at the same data we are.
cserial, cdataptr, cver, cdata = self._undoDataInfo( cserial, cdataptr, cdata, cver = self._undoDataInfo(
oid, ipos, tpos) oid, ipos, tpos)
# Versions of undone record and current record *must* match! # Versions of undone record and current record *must* match!
if cver != version: if cver != version:
......
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