From owner-svn-src-user@FreeBSD.ORG  Tue Nov  2 19:33:45 2010
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 C23621065670;
	Tue,  2 Nov 2010 19:33:45 +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 B1B5C8FC0C;
	Tue,  2 Nov 2010 19:33:45 +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 oA2JXjpt079145;
	Tue, 2 Nov 2010 19:33:45 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA2JXjRk079143;
	Tue, 2 Nov 2010 19:33:45 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201011021933.oA2JXjRk079143@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 2 Nov 2010 19:33:45 +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: r214683 - 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: Tue, 02 Nov 2010 19:33:45 -0000

Author: dougb
Date: Tue Nov  2 19:33:45 2010
New Revision: 214683
URL: http://svn.freebsd.org/changeset/base/214683

Log:
  For -a change to using PM_NEEDS_UPDATE for keeping track of things that
  have already been updated as dependencies of other ports that needed
  updating.
  
  In order to do the above effectively we need to preserve the (moderately
  hackish) space prepended to the list.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Tue Nov  2 18:34:31 2010	(r214682)
+++ user/dougb/portmaster/portmaster	Tue Nov  2 19:33:45 2010	(r214683)
@@ -242,7 +242,7 @@ safe_exit () {
 				pnu_temp="${pnu_temp}${i} "
 			done
 
-			PM_NEEDS_UPDATE="$pnu_temp"
+			PM_NEEDS_UPDATE=" ${pnu_temp}"
 		else
 			# Do these here so +IGNOREME can modify them
 			echo "num_of_deps='$num_of_deps'" >> $IPC_SAVE
@@ -2467,8 +2467,8 @@ post_first_pass () {
 		term_printf
 	fi
 
-	PM_NEEDS_UPDATE=${PM_NEEDS_UPDATE# }
-	[ -z "$PM_NEEDS_UPDATE" ] && return
+	# Only when -a or multi and user said no to update +IGNOREME(s)
+	[ "$PM_NEEDS_UPDATE" = ' ' ] && return
 
 	action=build
 	if [ "$PM_PACKAGES" = only ]; then
@@ -2834,7 +2834,12 @@ all_first_pass () {
 
 	unset roots trunks branches leaves
 
-	for origin in $PM_NEEDS_UPDATE; do update_port $origin; done
+	for origin in $PM_NEEDS_UPDATE; do
+		case "$PM_NEEDS_UPDATE" in
+		*\ $origin\ *)	update_port $origin ;;
+		'')		continue ;;	# Already updated as a dependency
+		esac
+	done
 
 	echo "===>>> Update check of installed ports complete" ; echo ''
 	safe_exit