summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorKim van der Riet <kpvdr@apache.org>2014-04-03 19:41:40 +0000
committerKim van der Riet <kpvdr@apache.org>2014-04-03 19:41:40 +0000
commitdbff5a5c84ff1ce83dd64130051b554f59491fda (patch)
treed0a883c9491290d8f8e42de3ecf6c6a131b04c65 /qpid/cpp/src
parent631a175a87b57f2e7fd087458156d7efe9f46edc (diff)
downloadqpid-python-dbff5a5c84ff1ce83dd64130051b554f59491fda.tar.gz
QPID-5660: [legacystore] Python tests fail with syntax error on Python 2.4
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1584347 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/linearstore/ISSUES2
-rwxr-xr-xqpid/cpp/src/tests/qpid-analyze-trace2
2 files changed, 3 insertions, 1 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(".")