From owner-svn-src-user@FreeBSD.ORG  Mon Nov 30 07:00:24 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 595B8106566C;
	Mon, 30 Nov 2009 07:00:24 +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 4936E8FC12;
	Mon, 30 Nov 2009 07:00:24 +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 nAU70O83021337;
	Mon, 30 Nov 2009 07:00:24 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAU70Oeo021335;
	Mon, 30 Nov 2009 07:00:24 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200911300700.nAU70Oeo021335@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 30 Nov 2009 07:00:24 +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: r199963 - 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, 30 Nov 2009 07:00:24 -0000

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?