diff options
| author | rillig <rillig@pkgsrc.org> | 2022-09-14 04:03:51 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2022-09-14 04:03:51 +0000 |
| commit | 3680e5232c1abb0f3391f21275f6581674ed948b (patch) | |
| tree | 712036d08a44eaf51d6c8ee1c2f9d58d3fd8baa3 /pkgtools | |
| parent | 6cf6b38342a505bac815ab3c2d69adb3cd30685f (diff) | |
| download | pkgsrc-3680e5232c1abb0f3391f21275f6581674ed948b.tar.gz | |
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 (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/lintpkgsrc/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/lintpkgsrc/files/lintpkgsrc.pl | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgtools/lintpkgsrc/Makefile b/pkgtools/lintpkgsrc/Makefile index 2ebd4dc93ba..6cb0c49ea01 100644 --- a/pkgtools/lintpkgsrc/Makefile +++ b/pkgtools/lintpkgsrc/Makefile @@ -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 diff --git a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl index 6df3075db12..4e1c10c35e1 100755 --- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl +++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl @@ -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>. # @@ -1558,7 +1558,11 @@ sub check_outdated_installed_packages($pkgsrcdir) { 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"; } |