d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pkg download: do not append to previous attempt 

Slow HTTP server with lag for tests:
https://gist.github.com/45472174f8bd97989c1eb9bc64d50468

Fix https://github.com/mxe/mxe/issues/1552
This commit is contained in:
Boris Nagaev 2016-12-04 04:08:04 +01:00
parent eeed35b5f1
commit 894608bf4d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -230,29 +230,30 @@ ESCAPE_PKG = \
BACKUP_DOWNLOAD = \ BACKUP_DOWNLOAD = \
(echo "MXE Warning! Downloading $(1) from backup." >&2 && \ (echo "MXE Warning! Downloading $(1) from backup." >&2 && \
($(WGET) -O- $(PKG_MIRROR)/`$(call ESCAPE_PKG,$(1))` || \ ($(WGET) -O '$(PKG_DIR)/.tmp-$($(1)_FILE)' $(PKG_MIRROR)/`$(call ESCAPE_PKG,$(1))` || \
$(WGET) -O- $(PKG_CDN)/`$(call ESCAPE_PKG,$(1))`)) $(WGET) -O '$(PKG_DIR)/.tmp-$($(1)_FILE)' $(PKG_CDN)/`$(call ESCAPE_PKG,$(1))`))
DOWNLOAD_PKG_ARCHIVE = \ DOWNLOAD_PKG_ARCHIVE = \
$(if $($(1)_SOURCE_TREE),\ $(if $($(1)_SOURCE_TREE),\
true\ true\
$(else),\ $(else),\
mkdir -p '$(PKG_DIR)' && ( \ mkdir -p '$(PKG_DIR)' && ( \
$(WGET) -T 30 -t 3 -O- '$($(1)_URL)' \ $(WGET) -T 30 -t 3 -O '$(PKG_DIR)/.tmp-$($(1)_FILE)' '$($(1)_URL)' \
$(if $($(1)_URL_2), \ $(if $($(1)_URL_2), \
|| (echo "MXE Warning! Downloading $(1) from second URL." >&2 && \ || (echo "MXE Warning! Downloading $(1) from second URL." >&2 && \
$(WGET) -T 30 -t 3 -O- '$($(1)_URL_2)')) \ $(WGET) -T 30 -t 3 -O '$(PKG_DIR)/.tmp-$($(1)_FILE)' '$($(1)_URL_2)')) \
$(if $(MXE_NO_BACKUP_DL),, \ $(if $(MXE_NO_BACKUP_DL),, \
|| $(BACKUP_DOWNLOAD)) \ || $(BACKUP_DOWNLOAD)) \
) \ ) && cat '$(PKG_DIR)/.tmp-$($(1)_FILE)' \
$(if $($(1)_FIX_GZIP), \ $(if $($(1)_FIX_GZIP), \
| gzip -d | gzip -9n, \ | gzip -d | gzip -9n, \
) \ ) \
> '$(PKG_DIR)/$($(1)_FILE)' || \ > '$(PKG_DIR)/$($(1)_FILE)' && \
rm '$(PKG_DIR)/.tmp-$($(1)_FILE)' || \
( echo; \ ( echo; \
echo 'Download failed!'; \ echo 'Download failed!'; \
echo; \ echo; \
rm -f '$(PKG_DIR)/$($(1)_FILE)'; )\ rm -f '$(PKG_DIR)/$($(1)_FILE)' '$(PKG_DIR)/.tmp-$($(1)_FILE)'; )\
) )
# open issue from 2002: # open issue from 2002: