From owner-svn-src-user@FreeBSD.ORG  Thu Jul 19 08:42:32 2012
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 0EFBC1065674;
	Thu, 19 Jul 2012 08:42:32 +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 EFD528FC1C;
	Thu, 19 Jul 2012 08:42:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6J8gV70060638;
	Thu, 19 Jul 2012 08:42:31 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6J8gVsx060636;
	Thu, 19 Jul 2012 08:42:31 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201207190842.q6J8gVsx060636@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Thu, 19 Jul 2012 08:42:31 +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: r238611 - 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: Thu, 19 Jul 2012 08:42:32 -0000

Author: dougb
Date: Thu Jul 19 08:42:31 2012
New Revision: 238611
URL: http://svn.freebsd.org/changeset/base/238611

Log:
  Removing $ALL_FETCH was a mistake because the reason it existed previously
  is that $UPDATE_ALL cannot be exported to the children. So bring it back
  as $PM_ALL_FETCH.
  
  This is basically a cosmetic bug which will only show up when using -Faf

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Thu Jul 19 05:34:19 2012	(r238610)
+++ user/dougb/portmaster/portmaster	Thu Jul 19 08:42:31 2012	(r238611)
@@ -2347,9 +2347,8 @@ update_port () {
 
 	dep_of_deps=$(( $dep_of_deps + 1 ))
 
-	[ -n "$PM_FIRST_PASS" ] &&
-		[ ! \( -n "$PM_FORCE" -a -n "$FETCH_ONLY" -a -n "$UPDATE_ALL" \) ] &&
-			num_of_deps=$(( $num_of_deps + 1 ))
+	[ -n "$PM_FIRST_PASS" ] && [ ! \( -n "$PM_FORCE" -a -n "$PM_ALL_FETCH" \) ] &&
+		num_of_deps=$(( $num_of_deps + 1 ))
 
 	deps="(${dep_of_deps}/${num_of_deps})"
 
@@ -3059,7 +3058,11 @@ all_first_pass () {
 	[ -n "$DI_FILES" ] && (read_distinfos)&
 
 	ports_by_category
-	[ -n "$FETCH_ONLY" -a -n "$PM_FORCE" ] && $num_of_deps=$num_ports
+	if [ -n "$FETCH_ONLY" ]; then
+		# UPDATE_ALL is not exported
+		export PM_ALL_FETCH=pm_all_fetch
+		[ -n "$PM_FORCE" ] && num_of_deps=$num_ports
+	fi
 	unset num_ports
 
 	init_term_printf All
@@ -3340,7 +3343,7 @@ if [ -z "$PM_INDEX_ONLY" -a -z "$PM_BUIL
 		TESTINT=`grep -l ^IS_INTERACTIVE Makefile` &&
 		    TESTINT=`pm_make_b -V IS_INTERACTIVE`
 	else
-		[ -n "$UPDATE_ALL" -a -n "$FETCH_ONLY" ] && safe_exit
+		[ -n "$PM_ALL_FETCH" ] && safe_exit
 	fi
 	if [ -n "$TESTINT" ]; then
 		echo ''