From owner-svn-src-user@FreeBSD.ORG  Sat Apr  9 06:01:37 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6CF24106564A;
	Sat,  9 Apr 2011 06:01:37 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5CAA58FC0C;
	Sat,  9 Apr 2011 06:01:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3961boT003035;
	Sat, 9 Apr 2011 06:01:37 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3961bLh003033;
	Sat, 9 Apr 2011 06:01:37 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201104090601.p3961bLh003033@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 9 Apr 2011 06:01:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220464 - user/dougb/portmaster
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Apr 2011 06:01:37 -0000

Author: dougb
Date: Sat Apr  9 06:01:37 2011
New Revision: 220464
URL: http://svn.freebsd.org/changeset/base/220464

Log:
  Add some code to --check-depends to explicitly handle --index-only.
  It worked before by ignoring the origin test if there was no ports
  directory, but failed if --index-only was also used.
  
  This is better both because it doesn't fail with --index-only, but
  also because it now uses the index to validate $origin.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sat Apr  9 02:22:49 2011	(r220463)
+++ user/dougb/portmaster/portmaster	Sat Apr  9 06:01:37 2011	(r220464)
@@ -1386,9 +1386,17 @@ IFS='
 
 		origin=`origin_from_pdb $iport` || continue
 
-		if [ -n "$pd" ] && [ ! -d "$pd/$origin" ]; then
+		if [ -z "$PM_INDEX_ONLY" ]; then
+			if [ -n "$pd" ] && [ ! -d "$pd/$origin" ]; then
+				missing=yes
+			fi
+		else
+			parse_index $origin name >/dev/null || missing=yes
+		fi
+		if [ -n "$missing" ]; then
 			echo "	===>>> $pd/$origin does not exist"
 			echo "	===>>> This port should probably be updated"
+			unset missing
 			continue
 		fi