diff options
| author | rillig <rillig@pkgsrc.org> | 2022-08-17 17:47:50 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2022-08-17 17:47:50 +0000 |
| commit | 6c15208f0ffc02122d022da728e662e28b9634f1 (patch) | |
| tree | c146ff88a98a41f0525ff218dc49dcc283fcb414 /pkgtools | |
| parent | 537b10c19c1d63598ecedf254643d02bd000b948 (diff) | |
| download | pkgsrc-6c15208f0ffc02122d022da728e662e28b9634f1.tar.gz | |
lintpkgsrc: eliminate common subexpression when parsing package
Diffstat (limited to 'pkgtools')
| -rwxr-xr-x | pkgtools/lintpkgsrc/files/lintpkgsrc.pl | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl index 57f4279730b..1b72931bee8 100755 --- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl +++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl @@ -1,5 +1,5 @@ #!@PERL5@ -# $NetBSD: lintpkgsrc.pl,v 1.109 2022/08/17 17:40:09 rillig Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.110 2022/08/17 17:47:50 rillig Exp $ # Written by David Brownlee <abs@netbsd.org>. # @@ -998,16 +998,16 @@ sub parse_makefile_pkgsrc($file) { if (defined $pkgname) { $pkgname = canonicalize_pkgname($pkgname); - if (defined $vars->{PKGREVISION} - and not $vars->{PKGREVISION} =~ /^\s*$/) { - if ($vars->{PKGREVISION} =~ /^\$\{(_(CVS|GIT|HG|SVN)_PKGVERSION):.*\}$/) { + my $pkgrevision = $vars->{PKGREVISION}; + if (defined $pkgrevision and not $pkgrevision =~ /^\s*$/) { + if ($pkgrevision =~ /^\$\{(_(CVS|GIT|HG|SVN)_PKGVERSION):.*\}$/) { # See wip/mk/*-package.mk. - } elsif ($vars->{PKGREVISION} =~ /\D/) { - print "\nBogus: PKGREVISION $vars->{PKGREVISION} (from $file)\n"; + } elsif ($pkgrevision =~ /\D/) { + print "\n"; + print "Bogus: PKGREVISION $pkgrevision (from $file)\n"; - } elsif ($vars->{PKGREVISION}) { - $pkgname .= 'nb'; - $pkgname .= $vars->{PKGREVISION}; + } elsif ($pkgrevision > 0) { + $pkgname .= "nb$pkgrevision"; } } @@ -1015,8 +1015,8 @@ sub parse_makefile_pkgsrc($file) { print "\nBogus: $pkgname (from $file)\n"; } elsif ($pkgname =~ /(.*)-(\d.*)/) { - if ($pkgdata) { - my ($pkgver) = $pkgdata->add($1, $2); + if (defined $pkgdata) { + my $pkgver = $pkgdata->add($1, $2); debug("add $1 $2"); |