diff options
| author | agc <agc@pkgsrc.org> | 2005-02-25 13:05:52 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2005-02-25 13:05:52 +0000 |
| commit | c323caee5be81f91a3ef0f37089668db48213dbc (patch) | |
| tree | 8bd439503c0342e1938a321be50c864def2e4b5c /mk | |
| parent | f04b47622f6a3de67c62480497bd812fb7654322 (diff) | |
| download | pkgsrc-c323caee5be81f91a3ef0f37089668db48213dbc.tar.gz | |
Fix a problem introduced in the previous commit, noticed by Matthiases
Scheler and Drochner.
Handle missing checksums in distinfo properly.
Tested by myself and tron.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 78496019d8b..f5ca24b29bd 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1594 2005/02/22 21:01:10 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1595 2005/02/25 13:05:52 agc Exp $ # # This file is in the public domain. # @@ -3765,17 +3765,17 @@ checksum: fetch uptodate-digest if [ ! -f ${DISTINFO_FILE} ]; then \ ${ECHO_MSG} "=> No checksum file."; \ else \ - (cd ${DISTDIR}; OK="true"; \ + (cd ${DISTDIR}; OK="true"; missing=""; \ for file in "" ${_CKSUMFILES}; do \ if [ "X$$file" = X"" ]; then continue; fi; \ - alg=`${AWK} 'NF == 4 && $$2 == "('$$file')" && $$3 == "=" {print $$1;}' ${DISTINFO_FILE}`; \ - for a in $$alg; do \ - if [ "X$$alg" = "X" ]; then \ - ${ECHO_MSG} "=> No checksum recorded for $$file."; \ - OK="false"; \ - else \ + filesummed=false; \ + for a in ${DIGEST_ALGORITHMS}; do \ + CKSUM2=`${AWK} 'NF == 4 && $$1 == "'$$a'" && $$2 == "('$$file')" && $$3 == "=" {print $$4;}' ${DISTINFO_FILE}`; \ + case "$${CKSUM2}" in \ + "") ${ECHO_MSG} "=> No $$a checksum recorded for $$file."; \ + ;; \ + *) filesummed=true; \ CKSUM=`${DIGEST} $$a < $$file`; \ - CKSUM2=`${AWK} '$$1 == "'$$a'" && $$2 == "('$$file')"{print $$4;}' ${DISTINFO_FILE}`; \ if [ "$$CKSUM2" = "IGNORE" ]; then \ ${ECHO_MSG} "=> Checksum for $$file is set to IGNORE in checksum file even though"; \ ${ECHO_MSG} " the file is not in the "'$$'"{IGNOREFILES} list."; \ @@ -3785,9 +3785,13 @@ checksum: fetch uptodate-digest else \ ${ECHO_MSG} "=> Checksum $$a mismatch for $$file."; \ OK="false"; \ - fi; \ - fi; \ + fi ;; \ + esac; \ done; \ + case "$$filesummed" in \ + false) missing="$$missing $$file"; \ + OK=false ;; \ + esac; \ done; \ for file in "" ${_IGNOREFILES}; do \ if [ "X$$file" = X"" ]; then continue; fi; \ @@ -3802,6 +3806,10 @@ checksum: fetch uptodate-digest fi; \ done; \ if [ "$$OK" != "true" ]; then \ + case "$$missing" in \ + "") ;; \ + *) ${ECHO_MSG} "Missing checksums for $$missing";; \ + esac; \ ${ECHO_MSG} "Make sure the Makefile and checksum file (${DISTINFO_FILE})"; \ ${ECHO_MSG} "are up to date. If you want to override this check, type"; \ ${ECHO_MSG} "\"${MAKE} NO_CHECKSUM=yes [other args]\"."; \ |