sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Makes image caching more resilient"

Browse Source
This commit is contained in:
Zuul 2019-05-31 08:54:31 +00:00 committed by Gerrit Code Review
commit d323928af0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@ done
url=$1 url=$1
dest=$2 dest=$2
time_cond= time_cond=
curl_opts="" curl_opts="--retry 3 --retry-delay 30 "
if [ -z $url -o -z $dest ] ; then if [ -z $url -o -z $dest ] ; then
show_options 1 show_options 1
@ -77,7 +77,7 @@ else
fi fi
if [ "$FORCE_REVALIDATE" = "1" ]; then if [ "$FORCE_REVALIDATE" = "1" ]; then
curl_opts="-H 'Pragma: no-cache, must-revalidate' -H 'Cache-Control: no-cache, must-revalidate'" curl_opts+="-H 'Pragma: no-cache, must-revalidate' -H 'Cache-Control: no-cache, must-revalidate'"
success="Downloaded and cached $url, having forced upstream caches to revalidate" success="Downloaded and cached $url, having forced upstream caches to revalidate"
elif [ -f $dest -a -s $dest ] ; then elif [ -f $dest -a -s $dest ] ; then
time_cond="-z $dest" time_cond="-z $dest"