svn commit: r199963 - user/dougb/portmaster

[Doug Barton]

Author: dougb
Date: Mon Nov 30 07:00:24 2009
New Revision: 199963
URL: http://svn.freebsd.org/changeset/base/199963

Log:
  Failure to fetch should not be fatal if we're trying the exact match

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon Nov 30 06:49:41 2009	(r199962)
+++ user/dougb/portmaster/portmaster	Mon Nov 30 07:00:24 2009	(r199963)
@@ -2462,8 +2462,7 @@ fetch_package () {
 
 		fetch $fetch_args -o $ppd ${sitepath}${1}.tbz 2>/dev/null || {
 			pm_unlink ${ppd}/${1}.tbz;
-			fetch $fetch_args -o $ppd ${sitepath}${1}.tbz ||
-				fail "Fetch for ${1}.tbz failed"; }
+			fetch $fetch_args -o $ppd ${sitepath}${1}.tbz; }
 	fi
 }
 fi
@@ -2633,7 +2632,7 @@ if [ -z "$use_package" ]; then
 	eval pm_make $port_log_args || fail "make failed for $portdir"
 else
 	# XXX fetch
-	fetch_package $latest_pv
+	fetch_package $latest_pv || fail "Fetch for ${latest_pv}.tbz failed"
 fi
 
 # XXX Build or package?