[pkgsrc/trunk]: pkgsrc/mk/fetch Do not perform checksum tests when explicitly...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/06999e659068
branches:  trunk
changeset: 366028:06999e659068
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Aug 01 13:15:32 2017 +0000

description:
Do not perform checksum tests when explicitly calling a make target that
creates or updates the checksum.  Allows users to set FAILOVER_FETCH in
mk.conf unconditionally and be able to update distinfo files without
first having to remove them.

diffstat:

 mk/fetch/fetch.mk |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 72abc79938d7 -r 06999e659068 mk/fetch/fetch.mk
--- a/mk/fetch/fetch.mk Tue Aug 01 13:14:58 2017 +0000
+++ b/mk/fetch/fetch.mk Tue Aug 01 13:15:32 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fetch.mk,v 1.68 2016/01/06 07:38:25 dholland Exp $
+# $NetBSD: fetch.mk,v 1.69 2017/08/01 13:15:32 jperkin Exp $
 
 .if empty(INTERACTIVE_STAGE:Mfetch) && empty(FETCH_MESSAGE:U)
 _MASTER_SITE_BACKUP=   ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
@@ -259,7 +259,8 @@
                ${SH} ${PKGSRCDIR}/mk/fetch/fetch
 
 _FETCH_ARGS+=  ${PKG_VERBOSE:D-v}
-.if exists(${DISTINFO_FILE})
+.if exists(${DISTINFO_FILE}) && !make(distinfo) && !make(makesum) \
+    && !make(makedistinfo) && !make(mdi)
 _FETCH_ARGS+=  ${FAILOVER_FETCH:D-c} -f ${DISTINFO_FILE:tA:Q}
 .endif
 .if !empty(PKG_RESUME_TRANSFERS:M[yY][eE][sS])