From owner-svn-src-user@FreeBSD.ORG  Thu Apr 28 21:41:00 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 CF80B106566C;
	Thu, 28 Apr 2011 21:41:00 +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 C01F08FC14;
	Thu, 28 Apr 2011 21:41:00 +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 p3SLf00d064848;
	Thu, 28 Apr 2011 21:41:00 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3SLf01q064846;
	Thu, 28 Apr 2011 21:41:00 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201104282141.p3SLf01q064846@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Thu, 28 Apr 2011 21:41:00 +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: r221186 - 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, 28 Apr 2011 21:41:00 -0000

Author: dougb
Date: Thu Apr 28 21:41:00 2011
New Revision: 221186
URL: http://svn.freebsd.org/changeset/base/221186

Log:
  When doing -F + --packages* for an individual port, don't bail out before
  we have checked the run dependencies

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Thu Apr 28 21:27:34 2011	(r221185)
+++ user/dougb/portmaster/portmaster	Thu Apr 28 21:41:00 2011	(r221186)
@@ -3537,7 +3537,7 @@ notnewer () {
 	fi
 fi	# [ -n "$pm_package_time" ]
 
-if [ -z "$use_package" -a -z "$FETCH_ONLY" ]; then
+if [ -z "$use_package" ]; then
 	if [ -n "$PM_PACKAGES" ]; then
 		[ -z "$PM_NO_MAKE_CONFIG" ] && make_config
 
@@ -3579,11 +3579,10 @@ if [ -z "$use_package" -a -z "$FETCH_ONL
 else
 	[ -z "$local_package" ] && {
 		fetch_package $latest_pv || fail "Fetch for ${latest_pv}.tbz failed"; }
-	check_fetch_only Package
 fi
 
-# Ignore if no old port exists
-if [ -n "$upg_port" -o -n "$ro_upg_port" ]; then
+# Ignore if no old port exists, or -F
+if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$FETCH_ONLY" ]; then
 	UPGRADE_PORT="${ro_upg_port:-$upg_port}"
 	UPGRADE_PORT_VER=`echo $UPGRADE_PORT | sed 's#.*-\(.*\)#\1#'`
 	export UPGRADE_PORT UPGRADE_PORT_VER
@@ -3635,6 +3634,7 @@ 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