svn commit: r199681 - user/dougb/portmaster

[Doug Barton]

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