[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files - In resolve_relative_path(), P...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ee3b3b0f55c
branches:  trunk
changeset: 503861:6ee3b3b0f55c
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Dec 01 16:11:27 2005 +0000

description:
- In resolve_relative_path(), PKGSRCDIR is replaced with $pkgsrcdir.
- In checkline_relative_path(), an info message is generated if a filename
  could not be resolved completely.

diffstat:

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

diffs (31 lines):

diff -r edc187a5ad78 -r 6ee3b3b0f55c pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Thu Dec 01 15:40:29 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Thu Dec 01 16:11:27 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.405 2005/12/01 15:21:56 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.406 2005/12/01 16:11:27 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -1082,6 +1082,7 @@
 sub resolve_relative_path($) {
        my ($relpath) = @_;
 
+       $relpath =~ s,\$\{PKGSRCDIR\},$pkgsrcdir,;
        $relpath =~ s,\$\{\.CURDIR\},.,;
        $relpath =~ s,\$\{PHPPKGSRCDIR\},../../lang/php5,;
        $relpath =~ s,\$\{SUSE_DIR_PREFIX\},suse91,;
@@ -1168,7 +1169,9 @@
                $line->log_error("A pkgsrc package must not depend on any outside package.");
        }
        $path = resolve_relative_path($path);
-       if ($path !~ regex_unresolved && !-e "${current_dir}/${path}") {
+       if ($path =~ regex_unresolved) {
+               $line->log_info("Unresolved path: \"${path}\".");
+       } elsif (!-e "${current_dir}/${path}") {
                $line->log_error("\"${path}\" does not exist.");
        }
 }