diff options
author | wiz <wiz@pkgsrc.org> | 2022-03-20 08:09:55 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2022-03-20 08:09:55 +0000 |
commit | f61f5d439023eb6fa3f4b619145708a9b32cd8d8 (patch) | |
tree | 4bf3bef514361e4b7b1d8f35f072e32206bb6c48 /pkgtools | |
parent | 2885d182c5866ad750f51254d1359c82da9a96a9 (diff) | |
download | pkgsrc-f61f5d439023eb6fa3f4b619145708a9b32cd8d8.tar.gz |
pkg_p5up2date: update to 0.07.
Write more useful entries in case 'make show-vars' fails.
Diffstat (limited to 'pkgtools')
-rw-r--r-- | pkgtools/pkg_p5up2date/Makefile | 5 | ||||
-rwxr-xr-x | pkgtools/pkg_p5up2date/files/pkg_p5up2date.pl | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/pkgtools/pkg_p5up2date/Makefile b/pkgtools/pkg_p5up2date/Makefile index f763301fed9..03aa2e5c518 100644 --- a/pkgtools/pkg_p5up2date/Makefile +++ b/pkgtools/pkg_p5up2date/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.21 2021/05/24 19:53:42 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2022/03/20 08:09:55 wiz Exp $ -PKGNAME= pkg_p5up2date-0.06 -PKGREVISION= 7 +PKGNAME= pkg_p5up2date-0.07 CATEGORIES= pkgtools MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/pkgtools/pkg_p5up2date/files/pkg_p5up2date.pl b/pkgtools/pkg_p5up2date/files/pkg_p5up2date.pl index d78c8fb1b5c..853eea88428 100755 --- a/pkgtools/pkg_p5up2date/files/pkg_p5up2date.pl +++ b/pkgtools/pkg_p5up2date/files/pkg_p5up2date.pl @@ -146,8 +146,10 @@ sub is_ne sub get_pkg_vars { my $varnames = join( " ", @_ ); - my @vals = qx($make_bin show-vars VARNAMES="$varnames"); chomp @vals; - return @vals; + my @vals = qx($make_bin show-vars VARNAMES="$varnames"); + my $retval = $?; + chomp @vals; + return $?, @vals; } sub get_inst_pkgs @@ -300,7 +302,12 @@ my @p5_pkg_dirs = find( directory => name => "p5-*", in => $pkgsrc_base ); foreach my $dn (@p5_pkg_dirs) { chdir( $dn ); - my ($distnm, $extract_sufx, $pkgnm, $maint ) = get_pkg_vars( qw(DISTNAME EXTRACT_SUFX PKGNAME MAINTAINER) ); + my ( $result, $distnm, $extract_sufx, $pkgnm, $maint ) = get_pkg_vars( qw(DISTNAME EXTRACT_SUFX PKGNAME MAINTAINER) ); + if ( $result != 0) { + $writer->write_entry( $dn, "", "out of sync?", "n/a", "!=", "n/a", "" ); + ++$pkgcrank; + next; + } my $pkgver = 0; if( $distnm =~ m/^(.*)-(v?[0-9].*?)$/ ) { |