openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Avoid hanging endlessly on unreachable cache urls"

This commit is contained in:
Jenkins 2017-06-29 08:03:25 +00:00 committed by Gerrit Code Review
parent 859e737ada 959226c55e
commit f0fb835db9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/elements/cache-url/bin/cache-url
View File

@ -86,7 +86,7 @@ else
success="Downloaded and cached $url for the first time"
fi
rcode=$(eval curl -v -L -o $tmp -w '%{http_code}' $curl_opts $url $time_cond)
rcode=$(curl -v -L -o $tmp -w '%{http_code}' --connect-timeout 10 $curl_opts $url $time_cond)
if [ "$rcode" == "200" -o "${url:0:7}" == "file://" ] ; then
# In cases where servers ignore the Modified time,
# curl cancels the download, outputs a 200 and leaves