From 3c19d511d79430c9238194b677e69bd15c321307 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 1 Apr 2015 00:15:05 +0200 Subject: [PATCH] support/download: properly catch missing hashes When checking hashes reports no hash for a file, and this is treated as an error (now: because BR2_ENFORCE_CHECK_HASH is set; later: because that will be the new and only behaviour), exit promptly in error. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- support/download/dl-wrapper | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 514118c57f..ef2d872938 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -45,10 +45,19 @@ main() { error "no output specified, use -o\n" fi - # If the output file already exists, do not download it again + # If the output file already exists and: + # - there's no .hash file: do not download it again and exit promptly + # - matches all its hashes: do not download it again and exit promptly + # - fails at least one of its hashes: force a re-download + # - there's no hash (but a .hash file): consider it a hard error if [ -e "${output}" ]; then if support/download/check-hash ${quiet} "${hfile}" "${output}" "${output##*/}"; then exit 0 + elif [ ${?} -ne 2 ]; then + # Do not remove the file, otherwise it might get re-downloaded + # from a later location (i.e. primary -> upstream -> mirror). + # Do not print a message, check-hash already did. + exit 1 fi rm -f "${output}" warn "Re-downloading '%s'...\n" "${output##*/}" -- 2.30.2