From c22fe04a789ef59add62612d1c5ceeadccd4e3ef Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 1 Apr 2015 00:15:01 +0200 Subject: [PATCH] support/download: make hash file optional Currently, specifying a hash file for our download wrapper is mandatory. However, when we download a git, svn, bzr, hg or cvs tree, there's by design no hash to check the download against. Since we're going to have hash checking mandatory when a hash file exists, this would break those downloads from a repository. So, make specifying a hash file optional when calling our download wrapper and bail out early from the check-hash script if no hash file is specified. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- support/download/check-hash | 2 +- support/download/dl-wrapper | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/support/download/check-hash b/support/download/check-hash index 4c07274cc9..cee64ef310 100755 --- a/support/download/check-hash +++ b/support/download/check-hash @@ -23,7 +23,7 @@ file="${2}" base="${3}" # Does the hash-file exist? -if [ ! -f "${h_file}" ]; then +if [ -z "${h_file}" -o ! -f "${h_file}" ]; then exit 0 fi diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 3b30840a0c..514118c57f 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -44,9 +44,6 @@ main() { if [ -z "${output}" ]; then error "no output specified, use -o\n" fi - if [ -z "${hfile}" ]; then - error "no hash-file specified, use -H\n" - fi # If the output file already exists, do not download it again if [ -e "${output}" ]; then -- 2.30.2