[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files The continuation line indicator...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b3be04f53109
branches:  trunk
changeset: 498907:b3be04f53109
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Sep 05 13:06:20 2005 +0000

description:
The continuation line indicator in regex_varassign is not needed
anymore, since assignments are checked on logical lines instead of
physical lines.

diffstat:

 pkgtools/pkglint/files/pkglint.pl |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r a0868be590ec -r b3be04f53109 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Mon Sep 05 12:53:13 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Mon Sep 05 13:06:20 2005 +0000
@@ -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_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 @@
 
        $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 @@
 
                # 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}.");