diff options
| author | rillig <rillig> | 2005-05-25 00:00:24 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-05-25 00:00:24 +0000 |
| commit | 576ccba95f2b02d5a5a987f396c3a1582c1cbf79 (patch) | |
| tree | 7fd70e0a7d94be83e6c92bb5f7c4f8cbdc5d1d76 | |
| parent | 3c4b7045534389eee040cc8cb69c077af3672345 (diff) | |
| download | pkgsrc-576ccba95f2b02d5a5a987f396c3a1582c1cbf79.tar.gz | |
Fixed a regular expression in checklines_direct_tools. Added debugging
output.
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 63227732924..5c72f3dab81 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.179 2005/05/24 23:50:07 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.180 2005/05/25 00:00:24 rillig Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by: @@ -1250,7 +1250,7 @@ sub checklines_direct_tools($) { EXTRACT_SUFX MASTER_SITES PKGNAME PKGSRC_USE_TOOLS - SUBST_MESSAGE\\.* + SUBST_MESSAGE\\..* .*_TARGET USE_TOOLS); my @ok_shellcmds = qw( @@ -1267,10 +1267,13 @@ sub checklines_direct_tools($) { my $tools = join("|", @tools, @cmd_tools); my $regex_tools = qr"(?:^|\s|/)(${tools})(?:\s|$)"; + log_info(NO_FILE, NO_LINE_NUMBER, "regex_tools=${regex_tools}"); my $ok_vars = join("|", @ok_vars); my $regex_ok_vars = qr"^(${ok_vars})$"; + log_info(NO_FILE, NO_LINE_NUMBER, "regex_ok_vars=${regex_ok_vars}"); my $ok_shellcmds = join("|", @ok_shellcmds); my $regex_ok_shellcmds = qr"^(${ok_shellcmds})$"; + log_info(NO_FILE, NO_LINE_NUMBER, "regex_ok_shellcmds=${regex_ok_shellcmds}"); foreach my $line (@{$lines}) { my $text = $line->text; |