[pkgsrc/trunk]: pkgsrc/mk Don't fail if there are multiple digest values for ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c006b5cf2292
branches:  trunk
changeset: 492601:c006b5cf2292
user:      agc <agc%pkgsrc.org@localhost>
date:      Sat Apr 16 09:26:22 2005 +0000

description:
Don't fail if there are multiple digest values for the same file with the
same algorithm in the distinfo file - pointed out by Robert Elz in PR 29973.

Additional testing by wiz - thanks!

diffstat:

 mk/bsd.pkg.mk |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 995ade968e0b -r c006b5cf2292 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat Apr 16 09:20:18 2005 +0000
+++ b/mk/bsd.pkg.mk     Sat Apr 16 09:26:22 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1612 2005/04/16 09:20:18 agc Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1613 2005/04/16 09:26:22 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -1305,7 +1305,7 @@
                                                alg=${PATCH_DIGEST_ALGORITHM};\
                                        fi;                             \
                                        CKSUM=`${DIGEST} $$alg < ${_DISTDIR}/$$bfile`; \
-                                       CKSUM2=`${AWK} '$$1 == "'$$alg'" && $$2 == "('$$file')" {print $$4;}' <${DISTINFO_FILE}`; \
+                                       CKSUM2=`${AWK} '$$1 == "'$$alg'" && $$2 == "('$$file')" {print $$4; exit}' <${DISTINFO_FILE}`; \
                                        if [ "$$CKSUM" = "$$CKSUM2" -o "$$CKSUM2" = "IGNORE" ]; then \
                                                break;                  \
                                        else                            \
@@ -3803,7 +3803,7 @@
                        if [ "X$$file" = X"" ]; then continue; fi;      \
                        filesummed=false;                               \
                        for a in ${DIGEST_ALGORITHMS}; do               \
-                               CKSUM2=`${AWK} 'NF == 4 && $$1 == "'$$a'" && $$2 == "('$$file')" && $$3 == "=" {print $$4;}' ${DISTINFO_FILE}`; \
+                               CKSUM2=`${AWK} 'NF == 4 && $$1 == "'$$a'" && $$2 == "('$$file')" && $$3 == "=" {print $$4; exit}' ${DISTINFO_FILE}`; \
                                case "$${CKSUM2}" in                    \
                                "")     ${ECHO_MSG} "=> No $$a checksum recorded for $$file."; \
                                        ;;                              \
@@ -3828,7 +3828,7 @@
                  done;                                                 \
                  for file in "" ${_IGNOREFILES}; do                    \
                        if [ "X$$file" = X"" ]; then continue; fi;      \
-                       CKSUM2=`${AWK} 'NF == 4 && $$3 == "=" && $$2 == "('$$file')"{print $$4;}' ${DISTINFO_FILE}`; \
+                       CKSUM2=`${AWK} 'NF == 4 && $$3 == "=" && $$2 == "('$$file')"{print $$4; exit}' ${DISTINFO_FILE}`; \
                        if [ "$$CKSUM2" = "" ]; then                    \
                                ${ECHO_MSG} "=> No checksum recorded for $$file, file is in "'$$'"{IGNOREFILES} list."; \
                                OK="false";                             \