From owner-svn-src-user@FreeBSD.ORG  Thu Jul 28 03:11:13 2011
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 6C4FE1065679;
	Thu, 28 Jul 2011 03:11:13 +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 5CA9F8FC08;
	Thu, 28 Jul 2011 03:11:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6S3BDlL083278;
	Thu, 28 Jul 2011 03:11:13 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6S3BDN5083276;
	Thu, 28 Jul 2011 03:11:13 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201107280311.p6S3BDN5083276@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Thu, 28 Jul 2011 03:11:13 +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: r224471 - 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: Thu, 28 Jul 2011 03:11:13 -0000

Author: dougb
Date: Thu Jul 28 03:11:12 2011
New Revision: 224471
URL: http://svn.freebsd.org/changeset/base/224471

Log:
  If a user has non-standard FETCH_ARGS it could circumvent the intent
  of --always-fetch, so forcibly unlink the file before proceeding to
  the fetch routine.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Thu Jul 28 03:01:22 2011	(r224470)
+++ user/dougb/portmaster/portmaster	Thu Jul 28 03:11:12 2011	(r224471)
@@ -3376,6 +3376,7 @@ fetch_package () {
 		fi
 	else
 		do_fetch=do_fetch_always_fetch
+		pm_unlink_s ${ppd}/${1}.tbz
 	fi
 
 	if [ -n "$do_fetch" ]; then