pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/lintpkgsrc/files lintpkgsrc: use single-quote...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d177d0f2476c
branches: trunk
changeset: 382736:d177d0f2476c
user: rillig <rillig%pkgsrc.org@localhost>
date: Thu Aug 04 05:50:54 2022 +0000
description:
lintpkgsrc: use single-quoted strings where possible
diffstat:
pkgtools/lintpkgsrc/files/lintpkgsrc.pl | 42 +++++++-------
pkgtools/lintpkgsrc/files/t/pkgversion.t | 86 ++++++++++++++++----------------
2 files changed, 64 insertions(+), 64 deletions(-)
diffs (256 lines):
diff -r 291b23692b5f -r d177d0f2476c pkgtools/lintpkgsrc/files/lintpkgsrc.pl
--- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl Thu Aug 04 05:45:15 2022 +0000
+++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl Thu Aug 04 05:50:54 2022 +0000
@@ -1,6 +1,6 @@
#!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.52 2022/08/04 05:45:15 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.53 2022/08/04 05:50:54 rillig Exp $
# Written by David Brownlee <abs%netbsd.org@localhost>.
#
@@ -308,13 +308,13 @@
foreach my $elem (split(/(pl|pre|rc|beta|alpha|\D)/, $pkgversion)) {
if ($elem =~ /\d/) {
push(@temp, +$elem);
- } elsif ($elem eq "pl" || $elem eq "." || $elem eq "_") {
+ } elsif ($elem eq 'pl' || $elem eq '.' || $elem eq '_') {
push(@temp, 0);
- } elsif ($elem eq "pre" || $elem eq "rc") {
+ } elsif ($elem eq 'pre' || $elem eq 'rc') {
push(@temp, -1);
- } elsif ($elem eq "beta") {
+ } elsif ($elem eq 'beta') {
push(@temp, -2);
- } elsif ($elem eq "alpha") {
+ } elsif ($elem eq 'alpha') {
push(@temp, -3);
} elsif ('a' le $elem && $elem le 'z') {
push(@temp, 0);
@@ -438,7 +438,7 @@
if (!defined $false) {
fail("Eval failed $line - $test");
}
- debug("conditional: evaluated to " . ($false ? 0 : 1) . "\n");
+ debug('conditional: evaluated to ' . ($false ? 0 : 1) . "\n");
} else {
$false = 0;
@@ -466,7 +466,7 @@
$_; } <FILE>;
close(FILE);
- $incdirs{"."} = 1;
+ $incdirs{'.'} = 1;
$incdirs{dirname($file)} = 1;
# Some Makefiles depend on these being set
@@ -588,7 +588,7 @@
}
verbose("$file: Cannot locate $incfile in "
- . join(" ", sort keys %incdirs)
+ . join(' ', sort keys %incdirs)
. "\n");
} else {
@@ -637,12 +637,12 @@
# Give python a little hand (XXX - do we wanna consider actually
# implementing make .for loops, etc?
#
- if ($key eq "PYTHON_VERSIONS_ACCEPTED") {
+ if ($key eq 'PYTHON_VERSIONS_ACCEPTED') {
my ($pv);
foreach $pv (split(/\s+/, $vars{PYTHON_VERSIONS_ACCEPTED})) {
- $vars{"_PYTHON_VERSION_FIRSTACCEPTED"} ||= $pv;
- $vars{"_PYTHON_VERSION_${pv}_OK"} = "yes";
+ $vars{'_PYTHON_VERSION_FIRSTACCEPTED'} ||= $pv;
+ $vars{"_PYTHON_VERSION_${pv}_OK"} = 'yes';
}
}
}
@@ -1105,7 +1105,7 @@
print "\nBogus: PKGREVISION $vars->{PKGREVISION} (from $file)\n";
} elsif ($vars->{PKGREVISION}) {
- $pkgname .= "nb";
+ $pkgname .= 'nb';
$pkgname .= $vars->{PKGREVISION};
}
}
@@ -1155,7 +1155,7 @@
sub load_pkgsrc_makefiles($) {
my ($fname) = @_;
- open(STORE, "<", $fname)
+ open(STORE, '<', $fname)
or die("Cannot read pkgsrc store from $fname: $!\n");
my ($pkgver);
$pkglist = PkgList->new;
@@ -1228,7 +1228,7 @@
my ($err, $msg);
defined $pkgver->var('DEPENDS') || next;
- foreach my $depend (split(" ", $pkgver->var('DEPENDS'))) {
+ foreach my $depend (split(' ', $pkgver->var('DEPENDS'))) {
$depend =~ s/:.*// || next;
@@ -1336,10 +1336,10 @@
next;
}
- my $pid = open3(my $in, my $out, undef, "xargs", "digest", $sum);
- defined($pid) || fail "fork";
+ my $pid = open3(my $in, my $out, undef, 'xargs', 'digest', $sum);
+ defined($pid) || fail 'fork';
my $pid2 = fork();
- defined($pid2) || fail "fork";
+ defined($pid2) || fail 'fork';
if ($pid2) {
close($in);
} else {
@@ -1356,7 +1356,7 @@
}
close($out);
waitpid($pid, 0) || fail "xargs digest $sum";
- waitpid($pid2, 0) || fail "pipe write to xargs";
+ waitpid($pid2, 0) || fail 'pipe write to xargs';
}
chdir_or_fail('/'); # Do not want to stay in $pkgdistdir
}
@@ -1366,7 +1366,7 @@
sub store_pkgsrc_makefiles($) {
my ($fname) = @_;
- open(STORE, ">", $fname)
+ open(STORE, '>', $fname)
or die("Cannot save pkgsrc store to $fname: $!\n");
my $prev = select(STORE);
$pkglist->store();
@@ -1470,7 +1470,7 @@
sub debug_parse_makefiles(@) {
foreach my $file (@_) {
- -d $file and $file .= "/Makefile";
+ -d $file and $file .= '/Makefile';
-f $file or fail("No such file: $file");
my ($pkgname, $vars) = parse_makefile_pkgsrc($file);
@@ -1540,7 +1540,7 @@
# distfiles downloaded on the current system
my @tmpdistfiles = listdir("$pkgdistdir", undef);
- my @dldistfiles = grep { $_ ne "pkg-vulnerabilities" } @tmpdistfiles;
+ my @dldistfiles = grep { $_ ne 'pkg-vulnerabilities' } @tmpdistfiles;
# sort the two arrays to make searching a bit faster
@dldistfiles = sort { $a cmp $b } @dldistfiles;
diff -r 291b23692b5f -r d177d0f2476c pkgtools/lintpkgsrc/files/t/pkgversion.t
--- a/pkgtools/lintpkgsrc/files/t/pkgversion.t Thu Aug 04 05:45:15 2022 +0000
+++ b/pkgtools/lintpkgsrc/files/t/pkgversion.t Thu Aug 04 05:50:54 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pkgversion.t,v 1.9 2022/08/04 05:45:15 rillig Exp $
+# $NetBSD: pkgversion.t,v 1.10 2022/08/04 05:50:54 rillig Exp $
use strict;
use warnings;
@@ -14,20 +14,20 @@
# See pkgtools/pkglint/files/pkgver/vercmp_test.go.
my @split_version_tests = (
- [ "5.0", [ [ 5, 0, 0 ], 0 ] ],
- [ "5.0nb5", [ [ 5, 0, 0 ], 5 ] ],
- [ "0.0.1-SNAP", [ [ 0, 0, 0, 0, 1, 0, 19, 0, 14, 0, 1, 0, 16 ], 0 ] ],
- [ "1.0alpha3", [ [ 1, 0, 0, -3, 3 ], 0 ] ],
- [ "1_0alpha3", [ [ 1, 0, 0, -3, 3 ], 0 ] ],
- [ "2.5beta", [ [ 2, 0, 5, -2 ], 0 ] ],
- [ "20151110", [ [ 20151110 ], 0 ] ],
- [ "0", [ [ 0 ], 0 ] ],
- [ "nb1", [ [], 1 ] ],
- [ "1.0.1a", [ [ 1, 0, 0, 0, 1, 0, 1 ], 0 ] ],
- [ "1.1.1dnb2", [ [ 1, 0, 1, 0, 1, 0, 4 ], 2 ] ],
- [ "1.0.1z", [ [ 1, 0, 0, 0, 1, 0, 26 ], 0 ] ],
- [ "0pre20160620", [ [ 0, -1, 20160620 ], 0 ] ],
- [ "3.5.DEV1710", [ [ 3, 0, 5, 0, 0, 4, 0, 5, 0, 22, 1710 ], 0 ] ],
+ [ '5.0', [ [ 5, 0, 0 ], 0 ] ],
+ [ '5.0nb5', [ [ 5, 0, 0 ], 5 ] ],
+ [ '0.0.1-SNAP', [ [ 0, 0, 0, 0, 1, 0, 19, 0, 14, 0, 1, 0, 16 ], 0 ] ],
+ [ '1.0alpha3', [ [ 1, 0, 0, -3, 3 ], 0 ] ],
+ [ '1_0alpha3', [ [ 1, 0, 0, -3, 3 ], 0 ] ],
+ [ '2.5beta', [ [ 2, 0, 5, -2 ], 0 ] ],
+ [ '20151110', [ [ 20151110 ], 0 ] ],
+ [ '0', [ [ 0 ], 0 ] ],
+ [ 'nb1', [ [], 1 ] ],
+ [ '1.0.1a', [ [ 1, 0, 0, 0, 1, 0, 1 ], 0 ] ],
+ [ '1.1.1dnb2', [ [ 1, 0, 1, 0, 1, 0, 4 ], 2 ] ],
+ [ '1.0.1z', [ [ 1, 0, 0, 0, 1, 0, 26 ], 0 ] ],
+ [ '0pre20160620', [ [ 0, -1, 20160620 ], 0 ] ],
+ [ '3.5.DEV1710', [ [ 3, 0, 5, 0, 0, 4, 0, 5, 0, 22, 1710 ], 0 ] ],
);
foreach my $test (@split_version_tests) {
@@ -44,34 +44,34 @@
# See pkgtools/pkglint/files/pkgver/vercmp_test.go.
my @versions = (
- [ "0pre20160620" ],
- [ "0" ],
- [ "0nb1", "0NB1", "0Nb1", "0nb00001" ],
- [ "0.0.1-SNAPSHOT" ],
- [ "1.0alpha" ],
- [ "1.0alpha3" ],
- [ "1", "1.0", "1.0.0" ],
- [ "1.0nb1", "1nb1" ],
- [ "1.0nb2", "1_0nb2" ],
- [ "1.0.0.0.0.0.0.1" ],
- [ "1.0.aa" ],
- [ "1.0.a1" ],
- [ "1.0.k" ],
- [ "1.0.1a" ],
- [ "1.0.1.2", "1.0ab" ],
- [ "1.0.1z" ],
- [ "1.0.11", "1.0k" ],
- [ "2.0pre", "2.0rc" ],
- [ "2.0", "2.0pl" ],
- [ "2.0.1nb4" ],
- [ "2.0.1nb17" ],
- [ "2.5beta" ],
- [ "5.0" ],
- [ "5.0nb5" ],
- [ "5.5", "5.005" ],
- [ "2021.06.17", "2021.6.17" ],
- [ "2021.12.01", "2021.12.1" ],
- [ "20151110" ],
+ [ '0pre20160620' ],
+ [ '0' ],
+ [ '0nb1', '0NB1', '0Nb1', '0nb00001' ],
+ [ '0.0.1-SNAPSHOT' ],
+ [ '1.0alpha' ],
+ [ '1.0alpha3' ],
+ [ '1', '1.0', '1.0.0' ],
+ [ '1.0nb1', '1nb1' ],
+ [ '1.0nb2', '1_0nb2' ],
+ [ '1.0.0.0.0.0.0.1' ],
+ [ '1.0.aa' ],
+ [ '1.0.a1' ],
+ [ '1.0.k' ],
+ [ '1.0.1a' ],
+ [ '1.0.1.2', '1.0ab' ],
+ [ '1.0.1z' ],
+ [ '1.0.11', '1.0k' ],
+ [ '2.0pre', '2.0rc' ],
+ [ '2.0', '2.0pl' ],
+ [ '2.0.1nb4' ],
+ [ '2.0.1nb17' ],
+ [ '2.5beta' ],
+ [ '5.0' ],
+ [ '5.0nb5' ],
+ [ '5.5', '5.005' ],
+ [ '2021.06.17', '2021.6.17' ],
+ [ '2021.12.01', '2021.12.1' ],
+ [ '20151110' ],
);
my $prev = $Test::TESTOUT;
Home |
Main Index |
Thread Index |
Old Index