summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-07-26 00:27:29 +0100
committerChris Lamb <chris@chris-lamb.co.uk>2008-07-26 00:27:29 +0100
commit2435bee4acd2dc3a7980b8ec67326dbb622fc2ff (patch)
tree620db8baff53ecf42888eb2b9d8d5b6e645418f0
parent364ed4e362514c58548ce4df59e18c21164f8f2d (diff)
downloadvyos-live-build-2435bee4acd2dc3a7980b8ec67326dbb622fc2ff.tar.gz
vyos-live-build-2435bee4acd2dc3a7980b8ec67326dbb622fc2ff.zip
Fix cache poisoning issue in lh_binary_debian-installer with 404 downloads
When wget 404's, an target file is created - this poisons the cache as the file is apparently downloaded but in actuality is simply empty. We fix this by unconditionally deleting the cache file if wget fails and emitting an error. Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
-rwxr-xr-xhelpers/lh_binary_debian-installer8
1 files changed, 7 insertions, 1 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 42412b012..b147b1225 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -207,7 +207,13 @@ Download_file () {
if [ ! -f "${_LH_CACHE_FILE}" ]
then
mkdir -p ${_LH_CACHE_DIR}
- wget ${WGET_OPTIONS} -O "${_LH_CACHE_FILE}" "${_LH_URL}"
+ if ! wget ${WGET_OPTIONS} -O "${_LH_CACHE_FILE}" "${_LH_URL}"
+ then
+ rm -f "${_LH_CACHE_FILE}"
+
+ Echo_error "Could not download file: ${_LH_URL}"
+ exit 1
+ fi
fi
cp -fl "${_LH_CACHE_FILE}" "${_LH_TARGET}"