From owner-svn-src-user@FreeBSD.ORG  Thu Oct 20 06:01:44 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 ED667106566C;
	Thu, 20 Oct 2011 06:01:44 +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 8055A8FC17;
	Thu, 20 Oct 2011 06:01:44 +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 p9K61ibf059760;
	Thu, 20 Oct 2011 06:01:44 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9K61inM059758;
	Thu, 20 Oct 2011 06:01:44 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201110200601.p9K61inM059758@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Thu, 20 Oct 2011 06:01:44 +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: r226555 - 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, 20 Oct 2011 06:01:45 -0000

Author: dougb
Date: Thu Oct 20 06:01:44 2011
New Revision: 226555
URL: http://svn.freebsd.org/changeset/base/226555

Log:
  Improve the handling of the -F option with packages, especially with
  --packages-only:
  
  In update_port() do better at saying what we're launching a child to do
  
  In post_first_pass() make clear that we are fetch'ing, not building,
  installing, etc.
  
  In multiport() call check_fetch_only when we're done
  
  In the main body add fetch'ed ports to the CUR_DEPS list so that they
  are only fetched once.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Wed Oct 19 23:48:15 2011	(r226554)
+++ user/dougb/portmaster/portmaster	Thu Oct 20 06:01:44 2011	(r226555)
@@ -2260,14 +2260,18 @@ update_port () {
 	if [ -n "$2" ]; then
 		echo "===>>> Launching child to update $1 to $2"
 	else
-		case "$1" in
-		*/*)	echo "===>>> Launching child to install ${1#$pd/}" ;;
-		*)	if [ -z "$FETCH_ONLY" ]; then
-				echo "===>>> Launching child to reinstall $1"
-			else
+		if [ -z "$FETCH_ONLY" ]; then
+			case "$1" in
+			*/*)	echo "===>>> Launching child to install ${1#$pd/}" ;;
+			*)	echo "===>>> Launching child to reinstall $1" ;;
+			esac
+		else
+			if [ "$PM_PACKAGES" != 'only' ]; then
 				echo "===>>> Launching child to check distfiles for $1"
-			fi ;;
-		esac
+			else
+				echo "===>>> Launching child to check package files for $1"
+			fi
+		fi
 	fi
 
 	dep_of_deps=$(( $dep_of_deps + 1 ))
@@ -2565,7 +2569,9 @@ post_first_pass () {
 	[ "$PM_NEEDS_UPDATE" = ' ' ] && return
 
 	action=build
-	if [ "$PM_PACKAGES" = only ]; then
+	if [ -n "$FETCH_ONLY" ]; then
+		action='fetch'
+	elif [ "$PM_PACKAGES" = only ]; then
 		action=install
 	elif [ -n "$PM_PACKAGES" ]; then
 		action='build and/or install'
@@ -2821,6 +2827,11 @@ multiport () {
 		urb_update urb_update_after_build
 	fi
 
+	if [ "$PM_PACKAGES" != 'only' ]; then
+		check_fetch_only
+	else
+		check_fetch_only Package
+	fi
 	safe_exit
 }
 
@@ -3668,6 +3679,8 @@ if [ -z "$PM_THOROUGH" -a -z "$NO_DEP_UP
 fi
 
 if [ -n "$FETCH_ONLY" ]; then		# Only reached here if using packages
+	CUR_DEPS="${CUR_DEPS}${new_port}:${portdir}:"
+
 	if [ "$$" -eq "$PM_PARENT_PID" ]; then
 		check_fetch_only Package
 	else