Received: by mail.netbsd.org (Postfix, from userid 605) id 7525584E67; Wed, 17 Aug 2022 18:18:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id AD92384E5C for ; Wed, 17 Aug 2022 18:18:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 0OnWqaOpXZps for ; Wed, 17 Aug 2022 18:18:21 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 092C084D38 for ; Wed, 17 Aug 2022 18:18:21 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 027FCFB1A; Wed, 17 Aug 2022 18:18:21 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_166076030060550" MIME-Version: 1.0 Date: Wed, 17 Aug 2022 18:18:20 +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: <20220817181821.027FCFB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_166076030060550 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Wed Aug 17 18:18:20 UTC 2022 Modified Files: pkgsrc/pkgtools/lintpkgsrc/files: lintpkgsrc.pl Log Message: lintpkgsrc: fix parse-guessing of pkgsrc-wip packages using an SCM To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 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. --_----------=_166076030060550 Content-Disposition: inline Content-Length: 1146 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.110 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.111 --- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.110 Wed Aug 17 17:47:50 2022 +++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl Wed Aug 17 18:18:20 2022 @@ -1,5 +1,5 @@ #!@PERL5@ -# $NetBSD: lintpkgsrc.pl,v 1.110 2022/08/17 17:47:50 rillig Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.111 2022/08/17 18:18:20 rillig Exp $ # Written by David Brownlee . # @@ -999,8 +999,12 @@ sub parse_makefile_pkgsrc($file) { $pkgname = canonicalize_pkgname($pkgname); my $pkgrevision = $vars->{PKGREVISION}; - if (defined $pkgrevision and not $pkgrevision =~ /^\s*$/) { - if ($pkgrevision =~ /^\$\{(_(CVS|GIT|HG|SVN)_PKGVERSION):.*\}$/) { + if (defined $pkgrevision && $pkgrevision !~ /^\s*$/) { + if ($pkgrevision =~ /^\$\{ (?: + _CVS_PKGVERSION | + _GIT_PKGVERSION_CMD | + _HG_PKGVERSION_CMD | + _SVN_PKGREVISION_CMD) :.* \}$ /x) { # See wip/mk/*-package.mk. } elsif ($pkgrevision =~ /\D/) { print "\n"; --_----------=_166076030060550--