svn commit: r214587 - user/dougb/portmaster

[Doug Barton]

Author: dougb
Date: Sun Oct 31 07:09:58 2010
New Revision: 214587
URL: http://svn.freebsd.org/changeset/base/214587

Log:
  In safe_exit() strip the prepended space from $PM_NEEDS_UPDATE before
  testing it with -n.
  
  Further reduce the amount of pointless stuff we do for -F, and clarify
  some user output to show we're fetching, not reinstalling.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sun Oct 31 04:45:53 2010	(r214586)
+++ user/dougb/portmaster/portmaster	Sun Oct 31 07:09:58 2010	(r214587)
@@ -211,6 +211,7 @@ parent_exit () {
 		echo ''
 	fi
 
+	PM_NEEDS_UPDATE=${PM_NEEDS_UPDATE# }
 	if [ -n "$1" -a -n "$PM_NEEDS_UPDATE" ]; then
 		echo ''
 		echo "===>>> You can restart from the point of failure with this command line:"
@@ -2144,7 +2145,11 @@ update_port () {
 	else
 		case "$1" in
 		*/*)	echo "===>>> Launching child to install ${1#$pd/}" ;;
-		*)	echo "===>>> Launching child to reinstall $1" ;;
+		*)	if [ -z "$FETCH_ONLY" ]; then
+				echo "===>>> Launching child to reinstall $1"
+			else
+				echo "===>>> Launching child to check distfiles for $1"
+			fi ;;
 		esac
 	fi
 
@@ -2680,7 +2685,7 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S
 
 	if [ -n "$LOCALBASE" ]; then
 		LOCALBASE_COMPAT="$LOCALBASE/lib/compat/pkg"
-	else
+	elif [ -z "$FETCH_ONLY" ]; then
 		PLB=`pm_make_b -f/usr/share/mk/bsd.port.mk -V LOCALBASE 2>/dev/null`
 		if [ -n "$PLB" ]; then
 			LOCALBASE_COMPAT="$PLB/lib/compat/pkg"
@@ -2724,9 +2729,12 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S
 		fi
 	fi
 
-	PM_FIRST_PASS=pm_first_pass ; PM_NEEDS_UPDATE=' '
-	NO_DEP_UPDATES=no_dep_updates ; build_l=''
-	export PM_FIRST_PASS PM_NEEDS_UPDATE NO_DEP_UPDATES build_l
+	PM_FIRST_PASS=pm_first_pass ; export PM_FIRST_PASS
+
+	if [ -z "$FETCH_ONLY" ]; then
+		PM_NEEDS_UPDATE=' ' ; NO_DEP_UPDATES=no_dep_updates ; build_l=''
+		export PM_NEEDS_UPDATE NO_DEP_UPDATES build_l
+	fi
 
 	if [ -n "$PM_BUILD_ONLY_LIST" ]; then
 		run_dl_g='' ; build_only_dl_g='' ; rundep_list=''
@@ -2975,7 +2983,7 @@ else
 	PM_DEPTH="${PM_DEPTH}>> ${upg_port:-$portdir} "
 fi
 
-if [ -n "$PM_FIRST_PASS" ]; then
+if [ -n "$PM_FIRST_PASS" -a -z "$FETCH_ONLY" ]; then
 	if [ -n "$upg_port" ]; then
 		update_build_l $upg_port
 		[ -n "$UPDATE_REQ_BYS" -a -n "$RESTART" -a "$$" -eq "$PM_PARENT_PID" ] &&