Commit de17439c authored by Vincent Pelletier's avatar Vincent Pelletier

tpc_vote can return the same kind of values as store, it must be handled.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@1756 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 5e45f3ef
...@@ -23,6 +23,7 @@ def runImport(neo, datafs): ...@@ -23,6 +23,7 @@ def runImport(neo, datafs):
def updateLastSerial(oid, result): def updateLastSerial(oid, result):
if result: if result:
if isinstance(result, str): if isinstance(result, str):
assert oid is not None
preindex[oid] = result preindex[oid] = result
else: else:
for oid, serial in result: for oid, serial in result:
...@@ -40,7 +41,7 @@ def runImport(neo, datafs): ...@@ -40,7 +41,7 @@ def runImport(neo, datafs):
pre = preindex.get(r.oid, None) pre = preindex.get(r.oid, None)
s = self.store(r.oid, pre, r.data, r.version, transaction) s = self.store(r.oid, pre, r.data, r.version, transaction)
updateLastSerial(r.oid, s) updateLastSerial(r.oid, s)
self.tpc_vote(transaction) updateLastSerial(None, self.tpc_vote(transaction))
self.tpc_finish(transaction) self.tpc_finish(transaction)
fiter.close() fiter.close()
return { return {
......
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