From owner-svn-src-user@FreeBSD.ORG  Sat Jan  1 01:26:27 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 0243E106566C;
	Sat,  1 Jan 2011 01:26:27 +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 CC5918FC08;
	Sat,  1 Jan 2011 01:26:26 +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 p011QQfV094424;
	Sat, 1 Jan 2011 01:26:26 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p011QQgk094422;
	Sat, 1 Jan 2011 01:26:26 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201101010126.p011QQgk094422@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 1 Jan 2011 01:26:26 +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: r216865 - 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, 01 Jan 2011 01:26:27 -0000

Author: dougb
Date: Sat Jan  1 01:26:26 2011
New Revision: 216865
URL: http://svn.freebsd.org/changeset/base/216865

Log:
  Add a test for $PM_INDEX_ONLY to pm_cd_pd itself, rather than testing
  for it prior to (nearly) every call.
  
  This has the side effect of solving the problem of the recently added
  test for WRKDIRPREFIX when not using any PORTSDIR.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sat Jan  1 01:06:27 2011	(r216864)
+++ user/dougb/portmaster/portmaster	Sat Jan  1 01:26:26 2011	(r216865)
@@ -267,7 +267,8 @@ safe_exit () {
 }
 
 pm_cd     () { builtin cd $1 2>/dev/null || return 1; }
-pm_cd_pd  () { builtin cd $pd/$1 2>/dev/null ||
+pm_cd_pd  () { [ -n "$PM_INDEX_ONLY" ] && return 2;
+		builtin cd $pd/$1 2>/dev/null ||
 		fail "Cannot cd to port directory: $pd/$1"; }
 pm_kill   () { /bin/kill $* >/dev/null 2>/dev/null; }
 pm_make   () { ( unset -v CUR_DEPS INSTALLED_LIST PM_DEPTH build_l;
@@ -1554,7 +1555,7 @@ check_for_updates () {
 			echo "	===>>> New version available: $port_ver"
 			[ -e "$pdb/$iport/+IGNOREME" ] &&
 				echo "	===>>> +IGNOREME file is present for $1"
-			[ -z "$PM_INDEX_ONLY" ] && { pm_cd_pd $origin ; check_state; }
+			pm_cd_pd $origin && check_state
 			num_updates=$(( $num_updates + 1 ))
 		else
 			unset moved_npd
@@ -3178,7 +3179,7 @@ fi	# [ -n "$PM_FIRST_PASS" ]
 
 [ -z "$PM_BUILDING" ] && export PM_BUILDING=pmbuildingmain
 
-[ -z "$PM_INDEX_ONLY" ] && pm_cd_pd $portdir
+pm_cd_pd $portdir
 
 if [ -n "$PM_BUILD_ONLY_LIST" ]; then
 	case "$build_only_dl_g" in
@@ -3200,7 +3201,7 @@ if [ -z "$NO_DEP_UPDATES" ]; then
 		echo "===>>> Starting check for all dependencies"
 		dependency_check all-depends-list
 	fi
-	[ -z "$PM_INDEX_ONLY" ] && pm_cd_pd $portdir
+	pm_cd_pd $portdir
 elif [ "$$" -eq "$PM_PARENT_PID" ]; then
 	echo "===>>> All dependencies are up to date"
 	echo ''
@@ -3426,7 +3427,7 @@ if [ -z "$use_package" ]; then
 		fi
 	fi
 
-	[ -z "$PM_INDEX_ONLY" ] && pm_cd_pd $portdir
+	pm_cd_pd $portdir
 	[ -z "$DONT_PRE_CLEAN" ] && { pm_make clean NOCLEANDEPENDS=ncd ||
 		fail 'make clean failed'; echo ''; }
 
@@ -3508,13 +3509,13 @@ if [ -n "$upg_port" -o -n "$ro_upg_port"
 		pm_pkg_delete_s -f $upg_port
 	fi
 
-	[ -z "$PM_INDEX_ONLY" ] && pm_cd_pd $portdir
+	pm_cd_pd $portdir
 fi
 
 if [ -z "$RECURSE_THOROUGH" -a -z "$NO_DEP_UPDATES" ]; then
 	echo '' ; echo "===>>> Starting check for runtime dependencies"
 	dependency_check run-depends-list
-	[ -z "$PM_INDEX_ONLY" ] && pm_cd_pd $portdir
+	pm_cd_pd $portdir
 fi
 
 install_failed () {