CVS commit: pkgsrc/pkgtools/lintpkgsrc

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Wed Sep 14 04:03:51 UTC 2022

Modified Files:
        pkgsrc/pkgtools/lintpkgsrc: Makefile
        pkgsrc/pkgtools/lintpkgsrc/files: lintpkgsrc.pl

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/pkgtools/lintpkgsrc/Makefile
cvs rdiff -u -r1.128 -r1.129 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/lintpkgsrc/Makefile
diff -u pkgsrc/pkgtools/lintpkgsrc/Makefile:1.54 pkgsrc/pkgtools/lintpkgsrc/Makefile:1.55
--- pkgsrc/pkgtools/lintpkgsrc/Makefile:1.54    Fri Aug 19 18:23:41 2022
+++ pkgsrc/pkgtools/lintpkgsrc/Makefile Wed Sep 14 04:03:51 2022
@@ -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

Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.128 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.129
--- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.128        Fri Aug 19 18:23:41 2022
+++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl      Wed Sep 14 04:03:51 2022
@@ -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 @@ sub check_outdated_installed_packages($p
                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";
        }