summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2001-12-27 19:13:13 +0000
committerabs <abs@pkgsrc.org>2001-12-27 19:13:13 +0000
commitab1caa7c6de6c892f3a83f29fb4ec38890f25b0d (patch)
tree48f24a7498a2a18443213b20a264a2a5bbc00115 /pkgtools
parent272d0ee17e1c923149956e67a4268f788154a953 (diff)
downloadpkgsrc-ab1caa7c6de6c892f3a83f29fb4ec38890f25b0d.tar.gz
Update pkglint to 3.20
lintpkgsrc - if we find one valid match in a DEPENDS entry, don't bitch about any others expanding to a non-existant package: Example: postgresql-{6.5.3*,7.0*,lib-*} With this lintpkgsrc -d now outputs six lines on current pkgsrc. Note to self: When you use 'cvs c^[P' the second time in an evening for the same package... its enough.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/Makefile4
-rwxr-xr-xpkgtools/pkglint/files/lintpkgsrc.pl8
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index bfe5122a6ba..187d354b348 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.123 2001/12/27 13:31:45 abs Exp $
+# $NetBSD: Makefile,v 1.124 2001/12/27 19:13:13 abs Exp $
#
-DISTNAME= pkglint-3.19
+DISTNAME= pkglint-3.20
CATEGORIES= pkgtools devel
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl
index 919bb909c51..61eccafad94 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.63 2001/12/27 13:31:45 abs Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.64 2001/12/27 19:13:14 abs Exp $
# Written by David Brownlee <abs@netbsd.org>.
#
@@ -407,11 +407,12 @@ sub get_default_makefile_vars
sub invalid_version
{
my($pkgmatch) = @_;
- my($fail);
+ my($fail, $ok);
my(@pkgmatches, @todo);
@todo = ($pkgmatch);
+ # We handle {} here, everything else in package_globmatch
while ($pkgmatch = shift @todo)
{
if ($pkgmatch =~ /(.*){([^{}]+)}(.*)/)
@@ -438,7 +439,10 @@ sub invalid_version
else
{ $fail .= "Unknown package: '$pkg' version $badver\n"; }
}
+ else
+ { $ok = 1; } # If we find one match, don't bitch about others
}
+ $ok && ($fail = undef);
$fail;
}