Commit 2e3759c5 authored by Grégory Wisniewski's avatar Grégory Wisniewski

Fix log.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2168 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 267eac4c
...@@ -668,7 +668,8 @@ class Application(object): ...@@ -668,7 +668,8 @@ class Application(object):
dump(oid), dump(serial), dump(conflict_serial)) dump(oid), dump(serial), dump(conflict_serial))
else: else:
logging.info('Conflict reported for %r:%r with later ' \ logging.info('Conflict reported for %r:%r with later ' \
'transaction %r , cannot resolve conflict.') 'transaction %r , cannot resolve conflict.', dump(oid),
dump(serial), dump(conflict_serial))
if not resolved: if not resolved:
# XXX: Is it really required to remove from data_dict ? # XXX: Is it really required to remove from data_dict ?
del data_dict[oid] del data_dict[oid]
......
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