Commit ae21fee9 authored by Chris McDonough's avatar Chris McDonough

Changed wording in undo errors from "undoable transaction" to "nonundoable transaction"

parent f723678d
...@@ -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.49 $'[11:-2] __version__='$Revision: 1.50 $'[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
...@@ -812,7 +812,7 @@ class FileStorage(BaseStorage.BaseStorage): ...@@ -812,7 +812,7 @@ class FileStorage(BaseStorage.BaseStorage):
raise POSException.UndoError, 'Invalid undo transaction id' raise POSException.UndoError, 'Invalid undo transaction id'
if h[16] == 'u': return if h[16] == 'u': return
if h[16] != ' ': if h[16] != ' ':
raise POSException.UndoError, 'Undoable transaction' raise POSException.UndoError, 'non-undoable transaction'
tl=U64(h[8:16]) tl=U64(h[8:16])
ul,dl,el=unpack(">HHH", h[17:23]) ul,dl,el=unpack(">HHH", h[17:23])
tend=tpos+tl tend=tpos+tl
...@@ -828,10 +828,10 @@ class FileStorage(BaseStorage.BaseStorage): ...@@ -828,10 +828,10 @@ class FileStorage(BaseStorage.BaseStorage):
dlen=42+(plen or 8) dlen=42+(plen or 8)
if vlen: dlen=dlen+(16+vlen) if vlen: dlen=dlen+(16+vlen)
if index_get(oid,0) != pos: if index_get(oid,0) != pos:
raise POSException.UndoError, 'Undoable transaction' raise POSException.UndoError, 'non-undoable transaction'
pos=pos+dlen pos=pos+dlen
if pos > tend: if pos > tend:
raise POSException.UndoError, 'Undoable transaction' raise POSException.UndoError, 'non-undoable transaction'
t[oid]=prev t[oid]=prev
seek(tpos+16) seek(tpos+16)
......
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