From owner-svn-src-user@FreeBSD.ORG  Sun Dec 26 20:18:51 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 45674106564A;
	Sun, 26 Dec 2010 20:18:51 +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 35AAC8FC0A;
	Sun, 26 Dec 2010 20:18:51 +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 oBQKIpb0098639;
	Sun, 26 Dec 2010 20:18:51 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBQKIpV3098637;
	Sun, 26 Dec 2010 20:18:51 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201012262018.oBQKIpV3098637@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 26 Dec 2010 20:18:51 +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: r216723 - 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: Sun, 26 Dec 2010 20:18:51 -0000

Author: dougb
Date: Sun Dec 26 20:18:50 2010
New Revision: 216723
URL: http://svn.freebsd.org/changeset/base/216723

Log:
  Fix some bugs with -r:
  1. In certain situations dependent ports that were otherwise up to date
     would be missed.
  2. For the purpose of not rebuilding the parent port when -R is used we
     only care about the dependencies of the parent port being up to date.
     So determine the value of PM_RBP_NEEDS_UPGRADE before entering the
     MASTER_RB_LIST loop, then only test PM_RBP_NEEDS_UPGRADE at the end
     and ignore NO_DEP_UPDATES since at that point it could refer to
     dependencies of the dependent ports.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sun Dec 26 19:08:41 2010	(r216722)
+++ user/dougb/portmaster/portmaster	Sun Dec 26 20:18:50 2010	(r216723)
@@ -1453,6 +1453,10 @@ check_state () {
 check_force_multi () {
 	if [ -n "$PM_FORCE" ]; then
 		check_restart_and_udf $1 || return 1
+	elif [ -n "$URB_YES" ]; then
+		case "$MASTER_RB_LIST" in
+		*" $1 "*) check_restart_and_udf $1 || return 1 ;;
+		esac
 	elif [ -n "$PM_MULTI_PORTS" ]; then
 		case "$PM_MULTI_PORTS" in
 		*:${1}:*)	return 1 ;;
@@ -2461,7 +2465,7 @@ post_first_pass () {
 	local action
 
 	if [ -n "$UPDATE_REQ_BYS" -a -n "$RESTART" ]; then
-		if [ -z "$NO_DEP_UPDATES" -o -n "$PM_RBP_NEEDS_UPGRADE" ]; then
+		if [ -n "$PM_RBP_NEEDS_UPGRADE" ]; then
 			echo "===>>> $PM_RBP and/or dependencies are out of date, forcing rebuild"
 		else
 			echo "===>>> $PM_RBP is up to date, skipping rebuild due to -R flag"
@@ -3136,6 +3140,7 @@ if [ -n "$PM_FIRST_PASS" ]; then
 
 		safe_exit
 	elif [ -n "$UPDATE_REQ_BYS" ]; then
+		[ -z "$NO_DEP_UPDATES" ] && PM_RBP_NEEDS_UPGRADE=pm_rbp_needs_upgrade
 		export URB_YES=urb_yes
 		echo ''
 		echo "===>>> Checking ports that depend on $upg_port"