From owner-svn-src-user@FreeBSD.ORG  Sat Apr 30 00:17:45 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 71305106579E;
	Sat, 30 Apr 2011 00:17: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 5ED748FC16;
	Sat, 30 Apr 2011 00:17:45 +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 p3U0HjWn021597;
	Sat, 30 Apr 2011 00:17:45 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3U0HjBh021595;
	Sat, 30 Apr 2011 00:17:45 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201104300017.p3U0HjBh021595@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 30 Apr 2011 00:17: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: r221235 - 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, 30 Apr 2011 00:17:45 -0000

Author: dougb
Date: Sat Apr 30 00:17:45 2011
New Revision: 221235
URL: http://svn.freebsd.org/changeset/base/221235

Log:
  Make -F --packages work with -r

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Fri Apr 29 23:13:43 2011	(r221234)
+++ user/dougb/portmaster/portmaster	Sat Apr 30 00:17:45 2011	(r221235)
@@ -2786,6 +2786,8 @@ urb_final () {
 	echo "===>>> Done updating ports that depend on $new_port"
 	echo ''
 
+	check_fetch_only Package
+
 	safe_exit
 }
 
@@ -3634,10 +3636,19 @@ fi
 if [ -z "$PM_THOROUGH" -a -z "$NO_DEP_UPDATES" ]; then
 	echo '' ; echo "===>>> Starting check for runtime dependencies"
 	dependency_check run-depends-list
-	[ -n "$use_package" ] && check_fetch_only Package
 	pm_cd_pd $portdir
 fi
 
+if [ -n "$FETCH_ONLY" ]; then		# Only reached here if using packages
+	if [ -n "$UPDATE_REQ_BYS" ] && [ -s "$pdb/$new_port/+REQUIRED_BY" ]; then
+		urb_final
+	elif [ "$$" -eq "$PM_PARENT_PID" ]; then
+		check_fetch_only Package
+	else
+		safe_exit
+	fi
+fi
+
 install_failed () {
 	local upg_port
 
@@ -3840,7 +3851,7 @@ if [ -z "$DONT_SCRUB_DISTFILES" ]; then
 	fi
 fi
 
-[ -n "$UPDATE_REQ_BYS" -a -s "$pdb/$new_port/+REQUIRED_BY" ] && urb_final
+[ -n "$UPDATE_REQ_BYS" ] && [ -s "$pdb/$new_port/+REQUIRED_BY" ] && urb_final
 
 safe_exit