kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

TOOLS_DEPENDS.* names a dependency, and all the directories that are

Browse source 
mentioned in it must actually contain a Makefile.
This commit is contained in:
rillig 2008-12-15 12:47:31 +00:00
parent c448324760
commit 03b5233b74
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgtools/pkglint/files/makevars.map
View file

@ -1,4 +1,4 @@
# $NetBSD: makevars.map,v 1.187 2008/11/18 08:04:35 rillig Exp $
# $NetBSD: makevars.map,v 1.188 2008/12/15 12:47:31 rillig Exp $
#
# This file contains the guessed type of some variables, according to
@ -669,6 +669,7 @@ TEXINFO_REQD List of Version [$package_list]
TOOLS_ALIASES List of Filename [$system]
TOOLS_BROKEN List of Tool [$system]
TOOLS_CREATE List of Tool [$system]
TOOLS_DEPENDS.* InternalList of DependencyWithPath [$system]
TOOLS_GNU_MISSING List of Tool [$system]
TOOLS_NOOP List of Tool [$system]
TOOLS_PATH.* Pathname [$system]

10
pkgtools/pkglint/files/pkglint.pl
View file

@ -1,5 +1,5 @@
#! @PERL@
# $NetBSD: pkglint.pl,v 1.795 2008/12/14 18:46:58 rillig Exp $
# $NetBSD: pkglint.pl,v 1.796 2008/12/15 12:47:31 rillig Exp $
#
# pkglint - static analyzer and checker for pkgsrc packages
@ -3650,7 +3650,13 @@ sub checkline_relative_pkgdir($$) {
checkline_relative_path($line, $path, true);
$path = resolve_relative_path($path, false);
if ($path !~ m"^(?:\./)?\.\./\.\./[^/]+/[^/]+$") {
if ($path =~ m"^(?:\./)?\.\./\.\./([^/]+/[^/]+)$") {
my $otherpkgpath = $1;
if (! -f "$cwd_pkgsrcdir/$otherpkgpath/Makefile") {
$line->log_error("There is no package in $otherpkgpath.");
}
} else {
$line->log_warning("\"${path}\" is not a valid relative package directory.");
$line->explain_warning(
"A relative pathname always starts with \"../../\", followed",