diff options
| author | rillig <rillig@pkgsrc.org> | 2005-09-05 13:06:20 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-09-05 13:06:20 +0000 |
| commit | 771539924dd06ee438f74b1595bd22475d33336d (patch) | |
| tree | e0cebe60f5e0f0e0ddf573e647037229345f6807 /pkgtools | |
| parent | 39e4e062af2bd47dd121eba86ce96fa6a730486d (diff) | |
| download | pkgsrc-771539924dd06ee438f74b1595bd22475d33336d.tar.gz | |
The continuation line indicator in regex_varassign is not needed
anymore, since assignments are checked on logical lines instead of
physical lines.
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 37cc7ab33fe..e6fe0c1cc9f 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -11,7 +11,7 @@ # Freely redistributable. Absolutely no warranty. # # From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp -# $NetBSD: pkglint.pl,v 1.278 2005/09/04 21:06:05 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.279 2005/09/05 13:06:20 rillig Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by: @@ -410,7 +410,7 @@ my $regex_unresolved = qr"\$\{"; my $regex_url = qr"^(?:http://|ftp://|#)"; # allow empty URLs my $regex_url_directory = qr"(?:http://|ftp://)\S+/"; my $regex_validchars = qr"[\011\040-\176]"; -my $regex_varassign = qr"^([-A-Z_a-z0-9.\${}]+)\s*(=|\?=|\+=|:=|!=)\s*(.*?)(\\?)$"; +my $regex_varassign = qr"^([-A-Z_a-z0-9.\${}]+)\s*(=|\?=|\+=|:=|!=)\s*(.*?)$"; my $regex_yes = qr"^(?:YES|yes)$"; my $regex_yesno = qr"^(?:YES|yes|NO|no)$"; @@ -725,7 +725,7 @@ sub checkline_valid_characters_in_variable($$) { $rest = $line->text; if ($rest =~ $regex_varassign) { - ($varname, undef, $rest, undef) = ($1, $2, $3, $4); + ($varname, undef, $rest) = ($1, $2, $3); } else { return; } @@ -1327,7 +1327,7 @@ sub checklines_direct_tools($) { # process variable assignments } elsif ($text =~ $regex_varassign) { - my ($varname, undef, $varvalue, $varcont) = ($1, $2, $3, $4); + my ($varname, undef, $varvalue) = ($1, $2, $3); if ($varname =~ $regex_ok_vars) { $line->log_info("Legitimate direct use of \"${tool}\" in variable ${varname}."); |