diff options
| author | wiz <wiz> | 2002-08-13 15:05:30 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2002-08-13 15:05:30 +0000 |
| commit | 4f2af6b00f3c24bfa9f770695be4f1effa19ec6e (patch) | |
| tree | 70553a42c9b930e1a68d4b4c36d86621d12d7623 /pkgtools | |
| parent | ba29186f9bd720bc5106e30966acb45d9f5ed8c6 (diff) | |
| download | pkgsrc-4f2af6b00f3c24bfa9f770695be4f1effa19ec6e.tar.gz | |
Strip leading './' from distinfo entry names before matching against
the file system -- removes bogus warnings for at least opera and
ymessenger, which have "DIST_SUBDIR=.".
Bump to 3.30.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkglint/files/lintpkgsrc.pl | 25 |
2 files changed, 18 insertions, 11 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 9dd87cb301a..64a20c30566 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.133 2002/07/11 10:22:25 abs Exp $ +# $NetBSD: Makefile,v 1.134 2002/08/13 15:05:30 wiz Exp $ # -DISTNAME= pkglint-3.29 +DISTNAME= pkglint-3.30 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl index 7f03aeec21b..3d30d52333f 100755 --- a/pkgtools/pkglint/files/lintpkgsrc.pl +++ b/pkgtools/pkglint/files/lintpkgsrc.pl @@ -1,6 +1,6 @@ #!@PREFIX@/bin/perl -# $NetBSD: lintpkgsrc.pl,v 1.68 2002/07/11 10:22:26 abs Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.69 2002/08/13 15:05:31 wiz Exp $ # Written by David Brownlee <abs@netbsd.org>. # @@ -1139,19 +1139,26 @@ sub scan_pkgsrc_distfiles_vs_distinfo { if (m/^(\w+) ?\(([^\)]+)\) = (\S+)/) { + my($dn,$ds,$dt); if ($2 =~ /^patch-[a-z0-9]+$/) { next; } - if (!defined $distfiles{$2}) + $dt = $1; + $dn = $2; + $ds = $3; + # Strip leading ./ which sometimes gets added + # because of DISTSUBDIR=. + $dn =~ s/^(\.\/)*//; + if (!defined $distfiles{$dn}) { - $distfiles{$2}{sumtype} = $1; - $distfiles{$2}{sum} = $3; - $distfiles{$2}{path} = "$cat/$pkgdir"; + $distfiles{$dn}{sumtype} = $dt; + $distfiles{$dn}{sum} = $ds; + $distfiles{$dn}{path} = "$cat/$pkgdir"; } - elsif ($distfiles{$2}{sumtype} eq $1 && - $distfiles{$2}{sum} ne $3) + elsif ($distfiles{$dn}{sumtype} eq $dt && + $distfiles{$dn}{sum} ne $ds) { - push(@distwarn, "checksum mismatch between '$1' ". - "in $cat/$pkgdir and $distfiles{$2}{path}\n"); + push(@distwarn, "checksum mismatch between '$dt' ". + "in $cat/$pkgdir and $distfiles{$dn}{path}\n"); } } } |