diff options
| author | rillig <rillig> | 2005-05-23 00:10:42 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-05-23 00:10:42 +0000 |
| commit | 0b6ea9bab1c44080576c9dc22499f4fb726aee6d (patch) | |
| tree | ba1521d8210cca56f5a4eaa1eb355793ce09b2e2 | |
| parent | 4343a9b6ea3c7a66378a75d1deef76eb6babd3f8 (diff) | |
| download | pkgsrc-0b6ea9bab1c44080576c9dc22499f4fb726aee6d.tar.gz | |
Fixed a bug introduced by the message normalization patch (forgot a !
operator). Don't blame the user for using tool names in PKGSRC_USE_TOOLS
and USE_TOOLS definitions, as this is what they are for.
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 29212550a51..f6369cefa37 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.168 2005/05/22 23:53:56 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.169 2005/05/23 00:10:42 rillig Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by: @@ -589,7 +589,7 @@ sub check_package() { # we need to handle the Makefile first to get some variables log_info(NO_FILE, NO_LINE_NUMBER, "Checking Makefile."); - if (checkfile_Makefile("Makefile")) { + if (!checkfile_Makefile("Makefile")) { log_error("$opt_packagedir/Makefile", NO_LINE_NUMBER, "Cannot be read."); return false; } @@ -1393,6 +1393,7 @@ sub checkfile_Makefile($) { # ...nor settings of TEST_TARGET & BUILD_TARGET $j =~ s/\nTEST_TARGET[\t ]*.*=[\t ]*[^\n]*\n/\nTEST_TARGET=#replaced\n/; $j =~ s/\nBUILD_TARGET[\t ]*.*=[\t ]*[^\n]*\n/\nBUILD_TARGET=#replaced\n/; + $j =~ s/\n(?:PKGSRC_)?USE_TOOLS[ \t]*\+=[ \t]*[^\n]*\n/\nUSE_TOOLS=#replaced\n/; if ($opt_warn_directcmd) { foreach my $i (keys %cmdnames) { if ($j =~ /[ \t\/@]$i[ \t\n;]/) { |