lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-09 12:37:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not complain about existing empty files

Browse Source 
Sometimes we pre-create the target filename using mktemp. In that case of
course the hash will not match, so avoid comparing.

Change-Id: Id0feb0178d659e03f5ceb000f738167cdc28a3ec
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
This commit is contained in:
Dimitrios Apostolou
2020-02-07 16:00:40 +01:00
parent 25fcda6ff3
commit b018b841c1
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
coin/provisioning/common/unix/DownloadURL.sh
View File

@@ -100,10 +100,18 @@ DownloadURL () {
targetFile=$4 targetFile=$4
fi fi
# If a non-empty file already exists
if [ -s "$targetFile" ]
then
if VerifyHash "$targetFile" "$expectedHash" if VerifyHash "$targetFile" "$expectedHash"
then then
echo "Skipping download, found and validated existing file: $targetFile" echo "Skipping download, found and validated existing file: $targetFile"
return
else else
echo "WARNING: Non-empty but different file found at destination; will re-download and overwrite file: $targetFile"
fi
fi
echo "Downloading from primary URL: $url" echo "Downloading from primary URL: $url"
if ! Download "$url" "$targetFile" if ! Download "$url" "$targetFile"
then then
@@ -115,5 +123,4 @@ DownloadURL () {
fi fi
fi fi
VerifyHash "$targetFile" "$expectedHash" VerifyHash "$targetFile" "$expectedHash"
fi
} }