Merge pull request #24213 from mikedanese/max-time

add a timeout for a single retry in download-or-bust
This commit is contained in:
Daniel Smith 2016-04-14 16:53:51 -07:00
commit 7e666e0865

View File

@ -154,7 +154,7 @@ download-or-bust() {
for url in "${urls[@]}"; do
local file="${url##*/}"
rm -f "${file}"
if ! curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10 "${url}"; then
if ! curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --max-time 80 --retry 6 --retry-delay 10 "${url}"; then
echo "== Failed to download ${url}. Retrying. =="
elif [[ -n "${hash}" ]] && ! validate-hash "${file}" "${hash}"; then
echo "== Hash validation of ${url} failed. Retrying. =="