From 96885ca7eb4a05e65986334d6138e1fe6afa46fc Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sat, 30 Jun 2012 11:43:03 +0000 Subject: pkg-download: handle interrupted wget downloads When a wget download is interrupted, the downloaded file is still created. It will therefore not be re-downloaded in the next build, and the extraction will fail. To avoid this, download to a temporary file first and rename when the download is successful. The existing mechanism doesn't work for interrupted downloads because the whole sub-shell is interrupted, so the rm-part never gets executed. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/pkg-download.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'package/pkg-download.mk') diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 7d1e54375..79837060b 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -158,11 +158,14 @@ endef # Download a file using wget. Only download the file if it doesn't # already exist in the download directory. If the download fails, # remove the file (because wget -O creates a 0-byte file even if the -# download fails). +# download fails). To handle an interrupted download as well, download +# to a temporary file first. The temporary file will be overwritten +# the next time the download is tried. define DOWNLOAD_WGET test -e $(DL_DIR)/$(2) || \ - $(WGET) -O $(DL_DIR)/$(2) '$(call qstrip,$(1))' || \ - (rm -f $(DL_DIR)/$(2) ; exit 1) + ($(WGET) -O $(DL_DIR)/$(2).tmp '$(call qstrip,$(1))' && \ + mv $(DL_DIR)/$(2).tmp $(DL_DIR)/$(2)) || \ + (rm -f $(DL_DIR)/$(2).tmp ; exit 1) endef define SOURCE_CHECK_WGET -- cgit v1.2.3