pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/lintpkgsrc pkgtools/lintpkgsrc: ignore exit s...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e8cbf6dea522
branches:  trunk
changeset: 385300:e8cbf6dea522
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Sep 14 04:03:51 2022 +0000

description:
pkgtools/lintpkgsrc: ignore exit status from running pkg_info

In case of multi-versioned packages like Python modules, lintpkgsrc
queries the wrong installed packages.

Bump version.

https://mail-index.netbsd.org/pkgsrc-users/2022/09/13/msg036186.html

diffstat:

 pkgtools/lintpkgsrc/Makefile            |  4 ++--
 pkgtools/lintpkgsrc/files/lintpkgsrc.pl |  8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r eaae54afcc23 -r e8cbf6dea522 pkgtools/lintpkgsrc/Makefile
--- a/pkgtools/lintpkgsrc/Makefile      Tue Sep 13 23:36:24 2022 +0000
+++ b/pkgtools/lintpkgsrc/Makefile      Wed Sep 14 04:03:51 2022 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2022/08/19 18:23:41 rillig Exp $
+# $NetBSD: Makefile,v 1.55 2022/09/14 04:03:51 rillig Exp $
 
-PKGNAME=       lintpkgsrc-2022.08.13
+PKGNAME=       lintpkgsrc-2022.09.14
 CATEGORIES=    pkgtools
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r eaae54afcc23 -r e8cbf6dea522 pkgtools/lintpkgsrc/files/lintpkgsrc.pl
--- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl   Tue Sep 13 23:36:24 2022 +0000
+++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl   Wed Sep 14 04:03:51 2022 +0000
@@ -1,5 +1,5 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.128 2022/08/19 18:23:41 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.129 2022/09/14 04:03:51 rillig Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -1558,7 +1558,11 @@
                while (<PKGINFO>) {
                        print " $1" if /^(.*?)-\d/;
                }
-               close(PKGINFO) or die;
+               # Ignore exit status, for backwards compatibility.
+               # This case occurs with packages like py*-expat, due to
+               # canonicalize_pkgname, as lintpkgsrc cannot handle
+               # multi-versioned packages.
+               close(PKGINFO) or do {};
                print "\n";
        }
 



Home | Main Index | Thread Index | Old Index