Received: by mail.netbsd.org (Postfix, from userid 605) id D253E84F63; Tue, 16 Aug 2022 19:40:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 18A2484D57 for ; Tue, 16 Aug 2022 19:40:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id NTXDk3VtrFFa for ; Tue, 16 Aug 2022 19:40:24 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 8FD8A84D22 for ; Tue, 16 Aug 2022 19:40:24 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8952FFB1A; Tue, 16 Aug 2022 19:40:24 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_166067882426090" MIME-Version: 1.0 Date: Tue, 16 Aug 2022 19:40:24 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/pkgtools/lintpkgsrc/files To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20220816194024.8952FFB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_166067882426090 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Tue Aug 16 19:40:24 UTC 2022 Modified Files: pkgsrc/pkgtools/lintpkgsrc/files: lintpkgsrc.pl Log Message: lintpkgsrc: cleanup: condense package_globmatch To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 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. --_----------=_166067882426090 Content-Disposition: inline Content-Length: 1814 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.102 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.103 --- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.102 Tue Aug 16 19:20:06 2022 +++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl Tue Aug 16 19:40:24 2022 @@ -1,5 +1,5 @@ #!@PERL5@ -# $NetBSD: lintpkgsrc.pl,v 1.102 2022/08/16 19:20:06 rillig Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.103 2022/08/16 19:40:24 rillig Exp $ # Written by David Brownlee . # @@ -829,29 +829,21 @@ sub glob2regex($glob) { sub package_globmatch($pkgmatch) { if ($pkgmatch =~ /^ ([^*?[]+) (<|>|<=|>=|-) (\d[^*?[{]*) $/x) { - # TODO: rename $matchpkgname to be more accurate. - my ($matchpkgname, $op, $matchver) = ($1, $2, $3); + my ($match_base, $op, $match_ver) = ($1, $2, $3); - if (my @pkgvers = $pkgdb->pkgvers_by_pkgbase($matchpkgname)) { - foreach my $pkgver (@pkgvers) { - if ($op eq '-') { - if ($pkgver->pkgversion eq $matchver) { - $matchver = undef; - last; - } - } else { - if (pkgversion_cmp($pkgver->pkgversion, $op, $matchver)) { - $matchver = undef; - last; - } - } + my @pkgvers = $pkgdb->pkgvers_by_pkgbase($match_base); + foreach my $pkgver (@pkgvers) { + if ($op eq '-' + ? $pkgver->pkgversion eq $match_ver + : pkgversion_cmp($pkgver->pkgversion, $op, $match_ver)) { + return ($match_base, undef); } + } - if ($matchver && $op ne '-') { - $matchver = "$op$matchver"; - } + if (@pkgvers && $match_ver && $op ne '-') { + $match_ver = "$op$match_ver"; } - ($matchpkgname, $matchver); + ($match_base, $match_ver); } elsif ($pkgmatch =~ /^ ([^[]+) - ([\d*?{[].*) $/x) { my ($matchpkgname, $matchver) = ($1, $2); --_----------=_166067882426090--