pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files - Disabled the check for direct...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8cde420e4f5e
branches:  trunk
changeset: 503827:8cde420e4f5e
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Dec 01 01:45:54 2005 +0000

description:
- Disabled the check for direct use of tool names completely, as there are
  two different kinds of tools in pkgsrc, which need different checks.

diffstat:

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

diffs (40 lines):

diff -r c984a2bee177 -r 8cde420e4f5e pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Thu Dec 01 01:19:30 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Thu Dec 01 01:45:54 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.396 2005/12/01 01:19:30 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.397 2005/12/01 01:45:54 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -1756,7 +1756,7 @@
                                } elsif ($varname =~ qr"^(?:TOOLS_PATH|_TOOLS_DEPMETHOD|_TOOLS_VARNAME)\.([-\w.]+|\[)$") {
                                        $tools->{$1} = true;
 
-                               } elsif ($varname eq "_TOOLS.x11-clients") {
+                               } elsif ($varname =~ qr"^_TOOLS\.") {
                                        foreach my $tool (split(qr"\s+", $value)) {
                                                $tools->{$tool} = true;
                                        }
@@ -1991,6 +1991,10 @@
                }
 
        } elsif ($type eq "Tool") {
+# FIXME: There are two different kinds of tools in pkgsrc.
+# I've asked jlam for appropriate checks. Until I get a
+# definite answer, this check will be disabled.
+if (false) {
                if ($value =~ qr"^([-\w]+|\[)(?::(\w+))?$") {
                        my ($toolname, $tooldep) = ($1, $2);
                        if (!exists(get_tool_names()->{$toolname})) {
@@ -2002,6 +2006,7 @@
                } else {
                        $line->log_error("Invalid tool syntax: \"${value}\".");
                }
+}
 
        } elsif ($type eq "URL") {
                if ($value eq "" && defined($comment) && $comment =~ qr"^#") {



Home | Main Index | Thread Index | Old Index