Don't complain about exact (non-range, non-wildcard) dependencies.
Now that mail/qmail-run "looks fine", replace it with another of my errant packages as a test case. Bump version.
This commit is contained in:
parent
c8e15717a5
commit
15217497c0
3 changed files with 9 additions and 12 deletions
|
@ -1,9 +1,9 @@
|
|||
# $NetBSD: Makefile,v 1.454 2014/11/23 15:30:07 mef Exp $
|
||||
# $NetBSD: Makefile,v 1.455 2014/12/06 22:21:30 schmonz Exp $
|
||||
|
||||
# Note: if you update the version number, please have a look at the
|
||||
# changes between the CVS tag "pkglint_current" and HEAD.
|
||||
# After updating, please re-set the CVS tag to HEAD.
|
||||
PKGNAME= pkglint-4.148
|
||||
PKGNAME= pkglint-4.149
|
||||
CATEGORIES= pkgtools
|
||||
|
||||
OWNER= wiz@NetBSD.org
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#! @PERL@
|
||||
# $NetBSD: pkglint.pl,v 1.873 2014/10/09 13:54:47 wiz Exp $
|
||||
# $NetBSD: pkglint.pl,v 1.874 2014/12/06 22:21:30 schmonz Exp $
|
||||
#
|
||||
|
||||
# pkglint - static analyzer and checker for pkgsrc packages
|
||||
|
@ -3930,7 +3930,7 @@ sub checkline_mk_vartype_basic($$$$$$$$) {
|
|||
},
|
||||
|
||||
Dependency => sub {
|
||||
if ($value =~ m"^(${regex_pkgbase})(<|=|>|<=|>=|!=)(${regex_pkgversion})$") {
|
||||
if ($value =~ m"^(${regex_pkgbase})(<|=|>|<=|>=|!=|-)(${regex_pkgversion})$") {
|
||||
my ($depbase, $depop, $depversion) = ($1, $2, $3);
|
||||
|
||||
} elsif ($value =~ m"^(${regex_pkgbase})-(?:\[(.*)\]\*|(\d+(?:\.\d+)*(?:\.\*)?)(\{,nb\*\}|\*|)|(.*))?$") {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#! @PERL@
|
||||
# $NetBSD: pkglint.t,v 1.12 2014/11/24 16:31:34 schmonz Exp $
|
||||
# $NetBSD: pkglint.t,v 1.13 2014/12/06 22:21:30 schmonz Exp $
|
||||
#
|
||||
|
||||
require 'pkglint.pl'; # so we can test its internals
|
||||
|
@ -148,14 +148,11 @@ sub test_pkglint_main {
|
|||
|
||||
sub test_lint_some_reference_packages {
|
||||
my %reference_packages = (
|
||||
'mail/qmail-run' => {
|
||||
'devel/syncdir' => {
|
||||
stdout_re => <<EOT,
|
||||
^WARN: .*distinfo: File not found\. Please run '.*make makesum'\.
|
||||
ERROR: .*Makefile: Each package must define its LICENSE\.
|
||||
ERROR: .*Makefile:[0-9]+: Unknown dependency pattern \"qmail-qfilter-1\.5nb1\"\.
|
||||
WARN: .*Makefile:[0-9]+: The LOCALBASE variable should not be used by packages\.
|
||||
WARN: .*Makefile:[0-9]+: The LOCALBASE variable should not be used by packages\.
|
||||
2 errors and 3 warnings found\..*\$
|
||||
^ERROR: .*Makefile: Each package must define its LICENSE\.
|
||||
ERROR: .*patches/patch-aa:[0-9]+: Comment expected\.
|
||||
2 errors and 0 warnings found\..*\$
|
||||
EOT
|
||||
stderr_re => undef,
|
||||
exitcode => 1,
|
||||
|
|
Loading…
Reference in a new issue