diff options
| author | rillig <rillig@pkgsrc.org> | 2007-09-04 09:44:07 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-09-04 09:44:07 +0000 |
| commit | bf6beaf8cb99acaf3f0afbc9873e7d848e60aa26 (patch) | |
| tree | 3024f16db54b885bbcbccc24e3a2ac7ea7a5080a /pkgtools | |
| parent | fe7dfb9bf3528f5e5d18ed269cb34213f22c6e97 (diff) | |
| download | pkgsrc-bf6beaf8cb99acaf3f0afbc9873e7d848e60aa26.tar.gz | |
Fixed some internal pkglint errors.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 74d5812afeb..5840695c55e 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.716 2007/09/04 09:34:20 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.717 2007/09/04 09:44:07 rillig Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -1789,7 +1789,7 @@ my $regex_shellword = qr"\s*( | \$\([^()]+\) # make(1) variable, $(...) | \$[/\@<^] # special make(1) variables | \$\$[0-9A-Z_a-z]+ # shell variable - | \$\$[?@] # special shell variables + | \$\$[\#?@] # special shell variables | \$\$\{[0-9A-Z_a-z]+\} # shell variable in braces | \$\$\( # POSIX-style backticks replacement | [^\(\)'\"\\\s;&\|<>\`\$] # non-special character @@ -4217,8 +4217,8 @@ sub checkline_mk_shellword($$$) { } elsif ($rest =~ s/^\`//) { $state = SWST_BACKT; } elsif ($rest =~ s/^\\(?:[ !"#'\(\)*;?\\^{|}]|\$\$)//) { - } elsif ($rest =~ s/^\$\$([0-9A-Z_a-z]+)// - || $rest =~ s/^\$\$\{([0-9A-Z_a-z]+)\}//) { + } elsif ($rest =~ s/^\$\$([0-9A-Z_a-z]+|\#)// + || $rest =~ s/^\$\$\{([0-9A-Z_a-z]+|\#)\}//) { my ($shvarname) = ($1); if ($opt_warn_quoting && $check_quoting) { $line->log_warning("Unquoted shell variable \"${shvarname}\"."); |