Received: by mail.netbsd.org (Postfix, from userid 605) id 7B68384DA2; Sun, 9 Jun 2019 13:57:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0180584D96 for ; Sun, 9 Jun 2019 13:57:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id kc8O5UqAxTVG for ; Sun, 9 Jun 2019 13:57:27 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 73CE884D50 for ; Sun, 9 Jun 2019 13:57:27 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6DE89FBF4; Sun, 9 Jun 2019 13:57:27 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1560088647127350" MIME-Version: 1.0 Date: Sun, 9 Jun 2019 13:57:27 +0000 From: "Leonardo Taccari" Subject: CVS commit: pkgsrc/net/py-rt To: pkgsrc-changes@NetBSD.org Reply-To: leot@netbsd.org X-Mailer: log_accum Message-Id: <20190609135727.6DE89FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1560088647127350 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: leot Date: Sun Jun 9 13:57:27 UTC 2019 Modified Files: pkgsrc/net/py-rt: Makefile distinfo Added Files: pkgsrc/net/py-rt/patches: patch-rt.py Log Message: py-rt: Backport upstream patch to fix search() Format='s' and Format='i' At least on RT 4 blank lines can be present at the end of the search response, backport upstream commit bb07009c4f62dd2ac393aab82fded6424eead82f to address that. Bump PKGREVISION To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/py-rt/Makefile pkgsrc/net/py-rt/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/net/py-rt/patches/patch-rt.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1560088647127350 Content-Disposition: inline Content-Length: 2620 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/py-rt/Makefile diff -u pkgsrc/net/py-rt/Makefile:1.1 pkgsrc/net/py-rt/Makefile:1.2 --- pkgsrc/net/py-rt/Makefile:1.1 Sat Sep 15 10:53:31 2018 +++ pkgsrc/net/py-rt/Makefile Sun Jun 9 13:57:27 2019 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2018/09/15 10:53:31 leot Exp $ +# $NetBSD: Makefile,v 1.2 2019/06/09 13:57:27 leot Exp $ DISTNAME= rt-1.0.11 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= net python MASTER_SITES= ${MASTER_SITE_PYPI:=r/rt/} Index: pkgsrc/net/py-rt/distinfo diff -u pkgsrc/net/py-rt/distinfo:1.1 pkgsrc/net/py-rt/distinfo:1.2 --- pkgsrc/net/py-rt/distinfo:1.1 Sat Sep 15 10:53:31 2018 +++ pkgsrc/net/py-rt/distinfo Sun Jun 9 13:57:27 2019 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1 2018/09/15 10:53:31 leot Exp $ +$NetBSD: distinfo,v 1.2 2019/06/09 13:57:27 leot Exp $ SHA1 (py-rt/rt-1.0.11.tar.gz) = 2a919c9df7a7aec75aa9f1f19df9fbc81341e784 RMD160 (py-rt/rt-1.0.11.tar.gz) = cd0ee2929ede3c878e21bf0750e4fe262550ded5 SHA512 (py-rt/rt-1.0.11.tar.gz) = 00007710d152472bf25e656b6298502e0b571932c8c3f4c498074fe7a849d575fd2deaad91a4814a7aece4dbfa847c913045e927830a8e0a02d3d13876562696 Size (py-rt/rt-1.0.11.tar.gz) = 35084 bytes +SHA1 (patch-rt.py) = a1180f06f39e1dba6fca86205755549c34d6b8b8 Added files: Index: pkgsrc/net/py-rt/patches/patch-rt.py diff -u /dev/null pkgsrc/net/py-rt/patches/patch-rt.py:1.1 --- /dev/null Sun Jun 9 13:57:27 2019 +++ pkgsrc/net/py-rt/patches/patch-rt.py Sun Jun 9 13:57:27 2019 @@ -0,0 +1,29 @@ +$NetBSD: patch-rt.py,v 1.1 2019/06/09 13:57:27 leot Exp $ + +Backport upstream commit bb07009c4f62dd2ac393aab82fded6424eead82f +to ignore ignore possible empty lines. + +--- rt.py.orig 2018-07-16 12:47:27.000000000 +0000 ++++ rt.py +@@ -518,15 +518,19 @@ class Rt: + return items + elif Format == 's': + items = [] +- msgs = msg.splitlines()[2:] ++ msgs = lines[2:] + for msg in msgs: ++ if "" == msg: # Ignore blank line at the end ++ continue + ticket_id, subject = msg.split(': ', 1) + items.append({'id': 'ticket/' + ticket_id, 'Subject': subject}) + return items + elif Format == 'i': + items = [] +- msgs = msg.splitlines()[2:] ++ msgs = lines[2:] + for msg in msgs: ++ if "" == msg: # Ignore blank line at the end ++ continue + _, ticket_id = msg.split('/', 1) + items.append({'id': 'ticket/' + ticket_id}) + return items --_----------=_1560088647127350--