[pypy-commit] pypy stmgc-c4: Re-enable printing conflicts, which seems to work fine now.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c4
Changeset: r66822:3c31bf7fd9ce
Date: 2013-09-06 21:23 +0200
http://bitbucket.org/pypy/pypy/changeset/3c31bf7fd9ce/

Log:	Re-enable printing conflicts, which seems to work fine now.

diff --git a/lib_pypy/transaction.py b/lib_pypy/transaction.py
--- a/lib_pypy/transaction.py
+++ b/lib_pypy/transaction.py
@@ -229,15 +229,13 @@
             while True:
                 with signals_enabled:
                     with atomic:
-                        # XXX the call to report_abort_info() is disabled for
-                        # XXX now because it's buggy
-                        #info = last_abort_info()
-                        #if info is None:
+                        info = last_abort_info()
+                        if info is None:
                             if not got_exception:
                                 f(*args, **kwds)
                             # else return early if already an exc to reraise
                             return
-                #report_abort_info(info)
+                report_abort_info(info)
         except:
             got_exception[:] = sys.exc_info()