From 6ad3c8a3ab3fcae856e37e021d99d2d5ebb8efa5 Mon Sep 17 00:00:00 2001 From: Arthur Nascimento Date: Sat, 20 Jun 2015 13:58:17 -0300 Subject: dowget.in: permit changing timeout and retries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With this change the -T and -t parameters in EXTRA_WGET will be used instead of being silently ignored. Change-Id: I8412fa1c91cc073877c6e4b2051a6b07aef23022 Reviewed-on: https://galileo.mailstation.de/gerrit/2588 Reviewed-by: Kylie McClain Reviewed-by: Bo Ørsted Andresen --- paludis/fetchers/dowget.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/paludis/fetchers/dowget.in b/paludis/fetchers/dowget.in index 165888c9a..9af645c11 100755 --- a/paludis/fetchers/dowget.in +++ b/paludis/fetchers/dowget.in @@ -38,8 +38,8 @@ if [[ -n "${PALUDIS_USE_SAFE_RESUME}" ]] ; then fi fi - echo ${WGET_WRAPPER} ${LOCAL_WGET:-wget} ${EXTRA_WGET} -T 30 -t 1 --continue -O "${2}".-PARTIAL- "${1}" 1>&2 - if ${WGET_WRAPPER} ${LOCAL_WGET:-wget} ${EXTRA_WGET} -T 30 -t 1 --continue -O "${2}".-PARTIAL- "${1}" ; then + echo ${WGET_WRAPPER} ${LOCAL_WGET:-wget} -T 30 -t 1 ${EXTRA_WGET} --continue -O "${2}".-PARTIAL- "${1}" 1>&2 + if ${WGET_WRAPPER} ${LOCAL_WGET:-wget} -T 30 -t 1 ${EXTRA_WGET} --continue -O "${2}".-PARTIAL- "${1}" ; then echo mv -f "${2}".-PARTIAL- "${2}" mv -f "${2}".-PARTIAL- "${2}" exit 0 @@ -49,8 +49,8 @@ if [[ -n "${PALUDIS_USE_SAFE_RESUME}" ]] ; then fi else - echo ${WGET_WRAPPER} ${LOCAL_WGET:-wget} ${EXTRA_WGET} -T 30 -t 1 -O "${2}" "${1}" 1>&2 - if ${WGET_WRAPPER} ${LOCAL_WGET:-wget} ${EXTRA_WGET} -T 30 -t 1 -O "${2}" "${1}" ; then + echo ${WGET_WRAPPER} ${LOCAL_WGET:-wget} -T 30 -t 1 ${EXTRA_WGET} -O "${2}" "${1}" 1>&2 + if ${WGET_WRAPPER} ${LOCAL_WGET:-wget} -T 30 -t 1 ${EXTRA_WGET} -O "${2}" "${1}" ; then exit 0 else rm -f "${2}" -- cgit v1.2.3