Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Jan 2015 22:52:51 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-projects@freebsd.org
Subject:   svn commit: r377836 - projects/rework-dependency-registration/Mk/Scripts
Message-ID:  <201501242252.t0OMqpxB049586@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sat Jan 24 22:52:51 2015
New Revision: 377836
URL: https://svnweb.freebsd.org/changeset/ports/377836
QAT: https://qat.redports.org/buildarchive/r377836/

Log:
  First try to directly find the file and only try to resolve the symlinks if they
  do not belong to any package

Modified:
  projects/rework-dependency-registration/Mk/Scripts/actual-package-depends.sh

Modified: projects/rework-dependency-registration/Mk/Scripts/actual-package-depends.sh
==============================================================================
--- projects/rework-dependency-registration/Mk/Scripts/actual-package-depends.sh	Sat Jan 24 22:22:26 2015	(r377835)
+++ projects/rework-dependency-registration/Mk/Scripts/actual-package-depends.sh	Sat Jan 24 22:52:51 2015	(r377836)
@@ -21,7 +21,9 @@ find_dep() {
 		searchfile=$(/usr/bin/which ${pattern} 2>/dev/null)
 		;;
 	esac
-	[ -n "${searchfile}" ] && ${PKG_BIN} which -q `realpath ${searchfile}`
+	if [ -n "${searchfile}" ]; then
+		${PKG_BIN} which -q ${searchfile} || ${PKG_BIN} which -q `realpath ${searchfile}`
+	fi
 }
 
 for lookup; do



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501242252.t0OMqpxB049586>