From owner-svn-src-user@FreeBSD.ORG  Mon Mar 29 07:54:20 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 BF51A1065670;
	Mon, 29 Mar 2010 07:54:20 +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 A69118FC0C;
	Mon, 29 Mar 2010 07:54:20 +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 o2T7sKsB090565;
	Mon, 29 Mar 2010 07:54:20 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2T7sKvj090563;
	Mon, 29 Mar 2010 07:54:20 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201003290754.o2T7sKvj090563@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 29 Mar 2010 07:54:20 +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: r205829 - 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: Mon, 29 Mar 2010 07:54:20 -0000

Author: dougb
Date: Mon Mar 29 07:54:20 2010
New Revision: 205829
URL: http://svn.freebsd.org/changeset/base/205829

Log:
  Minor updates from ports version 2.20:
  1. Add a 'sleep 5' to the warning about /etc/portmaster.rc
  2. Don't init_packages() if -F
  3. In the INIT phase revert the change to init_packages_var
  4. Add one more missing $PM_SU_CMD to the package fetch

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon Mar 29 07:09:27 2010	(r205828)
+++ user/dougb/portmaster/portmaster	Mon Mar 29 07:54:20 2010	(r205829)
@@ -28,7 +28,7 @@ if [ -z "$PM_PARENT_PID" ]; then
 		echo '       Your portmaster.rc is in /etc, however support for the file in this'
 		echo '       location is deprecated, and will be removed in a future version.'
 		echo '' ; echo '       The proper location for this file is /usr/local/etc'
-		echo '' ; . /etc/portmaster.rc
+		echo '' ; sleep 5 ; . /etc/portmaster.rc
 	fi
 	[ -r /usr/local/etc/portmaster.rc ] && . /usr/local/etc/portmaster.rc
 
@@ -1267,6 +1267,8 @@ fail 'The value of PACKAGES cannot be em
 init_packages () {
 	# Global: pbu
 
+	[ -n "$FETCH_ONLY" ] && return
+
 	init_packages_var
 
 	[ -n "$NO_BACKUP" ] && return
@@ -2393,7 +2395,7 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S
 		fi
 	fi
 
-	[ -n "$NO_BACKUP" -a -z "$MAKE_PACKAGE" ] || init_packages_var
+	[ -n "$NO_BACKUP" -a -z "$MAKE_PACKAGE" ] || init_packages
 	[ -z "$NO_BACKUP" -a -z "$BACKUP" ] && export NB_DELETE
 
 	# Set the file name here so it's visible to the children
@@ -2897,7 +2899,7 @@ fetch_package () {
 		[ -n "$PM_SU_VERBOSE" ] && echo "===>>> Fetching ${1}.tbz"
 		$PM_SU_CMD fetch $FETCH_ARGS -o $ppd ${sitepath}${1}.tbz 2>/dev/null || {
 			pm_unlink_s ${ppd}/${1}.tbz;
-			fetch $FETCH_ARGS -o $ppd ${sitepath}${1}.tbz 2>/dev/null; }
+			$PM_SU_CMD fetch $FETCH_ARGS -o $ppd ${sitepath}${1}.tbz 2>/dev/null; }
 	fi
 }
 	if [ -z "$PACKAGESITE" ]; then