diff options
| author | jperkin <jperkin@pkgsrc.org> | 2017-08-01 13:15:32 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2017-08-01 13:15:32 +0000 |
| commit | f02112735e13a0ec2ebbdc53451555746393c803 (patch) | |
| tree | ab765e4805fcfaae6ae6de5c9ad1394f316c6d8b /mk/fetch | |
| parent | 05c4c68662aba718c0dd94621e4b78c83995a9e5 (diff) | |
| download | pkgsrc-f02112735e13a0ec2ebbdc53451555746393c803.tar.gz | |
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 (limited to 'mk/fetch')
| -rw-r--r-- | mk/fetch/fetch.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk index 144326006b2..fab9027135f 100644 --- a/mk/fetch/fetch.mk +++ b/mk/fetch/fetch.mk @@ -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 @@ _FETCH_CMD= ${PKGSRC_SETENV} CHECKSUM=${_CHECKSUM_CMD:Q} \ ${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]) |