From owner-svn-ports-head@FreeBSD.ORG  Sat Aug 31 01:16:25 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 4CD97DA1;
 Sat, 31 Aug 2013 01:16:25 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3A3582C6C;
 Sat, 31 Aug 2013 01:16:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7V1GPhM061975;
 Sat, 31 Aug 2013 01:16:25 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7V1GPVH061974;
 Sat, 31 Aug 2013 01:16:25 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201308310116.r7V1GPVH061974@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sat, 31 Aug 2013 01:16:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r325760 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Aug 2013 01:16:25 -0000

Author: bdrewery
Date: Sat Aug 31 01:16:24 2013
New Revision: 325760
URL: http://svnweb.freebsd.org/changeset/ports/325760

Log:
  - make checksum: When encountering a checksum mismatch, delete the file
    before retrying.
  
    The previous behavior would try to download a range of the new bytes and
    then hit the 'Requested Range Not Satisfiable' error and never actually
    redownload the file.
  
    This fixes cases where a port is rerolled and distinfo updated, but
    users have a bad distfile sitting there that they would manually need
    to remove.
  
  Reviewed by:	bapt
  Reported by:	danfe
  With hat:	portmgr

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Sat Aug 31 01:09:44 2013	(r325759)
+++ head/Mk/bsd.port.mk	Sat Aug 31 01:16:24 2013	(r325760)
@@ -4769,6 +4769,7 @@ checksum: fetch check-checksum-algorithm
 						${ECHO_MSG} "=> $$alg Checksum mismatch for $$file."; \
 						refetchlist="$$refetchlist$$file "; \
 						OK="$${OK:-retry}"; \
+						[ "$${OK}" = "retry" -a ${FETCH_REGET} -gt 0 ] && ${RM} -f $${file}; \
 						ignored="false"; \
 					fi; \
 				fi; \