diff options
| author | rillig <rillig> | 2005-09-09 11:05:00 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-09-09 11:05:00 +0000 |
| commit | 3481a1ed45f4c0df23bdada72e20006d8641be82 (patch) | |
| tree | 3fe8437ae9d08bc21b02931002f73988505bd8f2 /pkgtools | |
| parent | bec776b520648793e4ef941b24a2a0f8f3a98bd8 (diff) | |
| download | pkgsrc-3481a1ed45f4c0df23bdada72e20006d8641be82.tar.gz | |
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 (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 9c98b01f7ac..deccabc4323 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.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 @@ sub readmakefile($$$$) { 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"; |