summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2005-03-02 11:11:36 +0000
committeragc <agc@pkgsrc.org>2005-03-02 11:11:36 +0000
commited8fe3b17932ed0dffc7913fd0cf10229e18f9eb (patch)
treef8b7c9a9ee7e53c57e5d41f70775db9ad9f2d3f3 /mk
parent784d1e01a2cab9152e8389f60356732988ea92b4 (diff)
downloadpkgsrc-ed8fe3b17932ed0dffc7913fd0cf10229e18f9eb.tar.gz
When FAILOVER_FETCH is set, only use the first digest algorithm found
for a dist file or patch, and let the "checksum" target do the full digest integrity checks. Should fix a problem reported by John Klos on tech-pkg, which I was a bit dim in analysing.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 01494ad66dc..fa166f2f731 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1596 2005/02/27 22:10:25 veego Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1597 2005/03/02 11:11:36 agc Exp $
#
# This file is in the public domain.
#
@@ -1277,7 +1277,7 @@ _FETCH_FILE= \
fi; \
if ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${bfile} ${FETCH_AFTER_ARGS}; then \
if [ -n "${FAILOVER_FETCH}" -a -f ${DISTINFO_FILE} -a -f ${_DISTDIR}/$$bfile ]; then \
- alg=`${AWK} 'NF == 4 && $$2 == "('$$file')" && $$3 == "=" {print $$1;}' ${DISTINFO_FILE}`; \
+ alg=`${AWK} 'NF == 4 && $$2 == "('$$file')" && $$3 == "=" {print $$1; exit}' ${DISTINFO_FILE}`; \
if [ -z "$$alg" ]; then \
alg=${PATCH_DIGEST_ALGORITHM};\
fi; \