qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kp...@apache.org
Subject svn commit: r1584347 - in /qpid/trunk/qpid: cpp/src/qpid/linearstore/ISSUES cpp/src/tests/qpid-analyze-trace tools/src/py/qpidstore/janal.py
Date Thu, 03 Apr 2014 19:41:40 GMT
Author: kpvdr
Date: Thu Apr  3 19:41:40 2014
New Revision: 1584347

URL: http://svn.apache.org/r1584347
Log:
QPID-5660: [legacystore] Python tests fail with syntax error on Python 2.4

Modified:
    qpid/trunk/qpid/cpp/src/qpid/linearstore/ISSUES
    qpid/trunk/qpid/cpp/src/tests/qpid-analyze-trace
    qpid/trunk/qpid/tools/src/py/qpidstore/janal.py

Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/ISSUES
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/ISSUES?rev=1584347&r1=1584346&r2=1584347&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/ISSUES (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/ISSUES Thu Apr  3 19:41:40 2014
@@ -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.
 

Modified: qpid/trunk/qpid/cpp/src/tests/qpid-analyze-trace
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/qpid-analyze-trace?rev=1584347&r1=1584346&r2=1584347&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/qpid-analyze-trace (original)
+++ qpid/trunk/qpid/cpp/src/tests/qpid-analyze-trace Thu Apr  3 19:41:40 2014
@@ -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(".")

Modified: qpid/trunk/qpid/tools/src/py/qpidstore/janal.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/py/qpidstore/janal.py?rev=1584347&r1=1584346&r2=1584347&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/py/qpidstore/janal.py (original)
+++ qpid/trunk/qpid/tools/src/py/qpidstore/janal.py Thu Apr  3 19:41:40 2014
@@ -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:



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message