diff options
| -rw-r--r-- | qpid/cpp/src/qpid/linearstore/ISSUES | 2 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/qpid-analyze-trace | 2 | ||||
| -rw-r--r-- | qpid/tools/src/py/qpidstore/janal.py | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/linearstore/ISSUES b/qpid/cpp/src/qpid/linearstore/ISSUES index 0909ebbcd9..528ff1edbe 100644 --- a/qpid/cpp/src/qpid/linearstore/ISSUES +++ b/qpid/cpp/src/qpid/linearstore/ISSUES @@ -40,6 +40,7 @@ Current/pending: svn r.1561848 2014-01-27: Bugfixes and enhancements for qpid_qls_analyze svn r.1564808 2014-02-05: Bugfixes and enhancements for qpid_qls_analyze svn r.1578899 2014-03-18: Bugfixes and enhancements for qpid_qls_analyze + svn r.1583778 2014-04-01: Bugfix for qpid_qls_analyze * Store analysis and status * Recovery/reading of message content * Empty file pool status and management @@ -145,6 +146,7 @@ no. svn r Q-JIRA RHBZ Date 22. 1575009 5607 1064181 2014-03-06 23. 1578899 5362 - 2014-03-18 24. 1582730 5651 - 2014-03-28 +25. 1583778 5362 - 2014-04-01 See above sections for details on these checkins. diff --git a/qpid/cpp/src/tests/qpid-analyze-trace b/qpid/cpp/src/tests/qpid-analyze-trace index 65c673e511..009fbc441c 100755 --- a/qpid/cpp/src/tests/qpid-analyze-trace +++ b/qpid/cpp/src/tests/qpid-analyze-trace @@ -217,7 +217,7 @@ class TraceAnalysis: elif lline.contains("xCommitBody") or lline.contains("xRollbackBody"): lline.txn_cnt = ssn.txn_cnt ssn.txn_cnt += 1 - except KeyboardInterrupt as e: raise e + except KeyboardInterrupt, e: raise e except: pass if (lcnt + 1) % PROGRESS_LINES_PER_DOT == 0: sys.stdout.write(".") diff --git a/qpid/tools/src/py/qpidstore/janal.py b/qpid/tools/src/py/qpidstore/janal.py index 231b283c05..1a892aca60 100644 --- a/qpid/tools/src/py/qpidstore/janal.py +++ b/qpid/tools/src/py/qpidstore/janal.py @@ -219,7 +219,7 @@ class TxnMap(object): if isinstance(hdr, jrnl.DeqRec): try: self.__emap.unlock(hdr.deq_rid) - except jerr.NonExistentRecordError as err: # Not in emap, look in current transaction op list (TPL) + except jerr.NonExistentRecordError, err: # Not in emap, look in current transaction op list (TPL) found_rid = False for _, hdr1, _ in self.__map[xid]: if isinstance(hdr1, jrnl.EnqRec) and hdr1.rid == hdr.deq_rid: |