From 327e33a3207773181e2a7c49f79d5c9c1f159c54 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 30 Aug 2018 04:39:33 +0100 Subject: [PATCH] scripts/get, tools-distro-tool: fix wget redirection issue --- scripts/get_archive | 2 +- tools/distro-tool | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/get_archive b/scripts/get_archive index 1f82ea8d0d..2259dfbc53 100755 --- a/scripts/get_archive +++ b/scripts/get_archive @@ -21,7 +21,7 @@ export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE)) PACKAGE_MIRROR="$DISTRO_MIRROR/$PKG_NAME/$PKG_SOURCE_NAME" [ "$VERBOSE" != "yes" ] && WGET_OPT=-q -WGET_CMD="wget --timeout=30 --tries=3 --passive-ftp --no-check-certificate -c $WGET_OPT -O $PACKAGE" +WGET_CMD="wget --output-file=- --timeout=30 --tries=3 --passive-ftp --no-check-certificate -c $WGET_OPT -O $PACKAGE" # unset LD_LIBRARY_PATH to stop wget from using toolchain/lib and loading libssl.so/libcrypto.so instead of host libraries unset LD_LIBRARY_PATH diff --git a/tools/distro-tool b/tools/distro-tool index 0d43b96e76..b6ac8b5a97 100755 --- a/tools/distro-tool +++ b/tools/distro-tool @@ -349,7 +349,7 @@ class MyUtility(object): while attempts < retries: if stopped.is_set(): break attempts += 1 - (result, output) = MyUtility.runcommand(msgs, "wget --timeout=30 --tries=3 --passive-ftp --no-check-certificate -O %s %s" % (filename_data, url), logfile=filename_log) + (result, output) = MyUtility.runcommand(msgs, "wget --output-file=- --timeout=30 --tries=3 --passive-ftp --no-check-certificate -O %s %s" % (filename_data, url), logfile=filename_log) if result == 0: return True