From owner-svn-src-user@FreeBSD.ORG  Sun Nov 22 21:58:07 2009
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 4842E1065696;
	Sun, 22 Nov 2009 21:58:07 +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 388DC8FC15;
	Sun, 22 Nov 2009 21:58:07 +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 nAMLw7pl031156;
	Sun, 22 Nov 2009 21:58:07 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAMLw7tk031154;
	Sun, 22 Nov 2009 21:58:07 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200911222158.nAMLw7tk031154@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 22 Nov 2009 21:58:07 +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: r199681 - 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, 22 Nov 2009 21:58:07 -0000

Author: dougb
Date: Sun Nov 22 21:58:06 2009
New Revision: 199681
URL: http://svn.freebsd.org/changeset/base/199681

Log:
  In safe_exit() when deleting build-only packages add a cd before running
  pkg_delete to avoid it not being able to find its working directory.
  
  Remove unneeded spaces from rundeps
  
  In the package fetching code only set $packages if it's not already set

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sun Nov 22 21:53:09 2009	(r199680)
+++ user/dougb/portmaster/portmaster	Sun Nov 22 21:58:06 2009	(r199681)
@@ -196,6 +196,7 @@ safe_exit () {
 
 		if [ -n "$build_deps_il" ]; then
 		echo "===>>> Deleting installed build-only dependencies"
+			cd
 			for f in $build_deps_il; do
 				[ -n "$PM_VERBOSE" ] && echo "       $f"
 				pkg_delete -f $f
@@ -1678,7 +1679,6 @@ dependency_check () {
 
 		if [ -z "$RECURSE_THOROUGH" ]; then
 			rundeps=`pm_make run-depends-list | sort -u`
-			rundeps=" $rundeps "
 
 			for dep in $d_port_list; do
 				case "$rundeps" in
@@ -2575,7 +2575,8 @@ else
 	# XXX fetch
 
 	# Duplicated from pkg_init()
-	packages=`pm_make -f/usr/share/mk/bsd.port.mk -V PACKAGES`
+	[ -z "$packages" ] &&
+		packages=`pm_make -f/usr/share/mk/bsd.port.mk -V PACKAGES`
 	[ -n "$packages" ] || fail 'The value of PACKAGES cannot be empty'
 
 	ppd=$packages/portmaster-download