pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Changed the regular expression ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b6ce5f4b120
branches:  trunk
changeset: 499097:1b6ce5f4b120
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Sep 09 11:05:00 2005 +0000

description:
Changed the regular expression for detecting valid .include lines in
Makefiles. I had intended not to read files whose name contains $
characters, but had not written exactly that in the code.
Fixes PR 31213.

diffstat:

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

diffs (21 lines):

diff -r 78017599e67e -r 1b6ce5f4b120 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Fri Sep 09 10:56:26 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Fri Sep 09 11:05:00 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.282 2005/09/06 10:30:00 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.283 2005/09/09 11:05:00 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -1119,7 +1119,7 @@
 
                push(@{$all_lines}, $line);
                # try to get any included file
-               if ($text =~ qr"^\.\s*include\s+\"([-./\w]+)\"$") {
+               if ($text =~ qr"^\.\s*include\s+\"([^\$]+)\"$") {
                        $includefile = $1;
                        if (exists($seen_Makefile_include->{$includefile})) {
                                $contents .= "### pkglint ### skipped $includefile\n";



Home | Main Index | Thread Index | Old Index