From: Michael Vogt Date: Sat, 22 Feb 2014 21:04:22 +0000 (+0100) Subject: fix ADT failure in downloadfile() X-Git-Tag: 0.9.15.4~4 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/3e5f181e51bc94fa45e9a36fb094cd3051212013?hp=--cc fix ADT failure in downloadfile() --- 3e5f181e51bc94fa45e9a36fb094cd3051212013 diff --git a/test/integration/framework b/test/integration/framework index be2cb95d1..99214ef73 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -935,6 +935,10 @@ changetocdrom() { downloadfile() { PROTO="$(echo "$1" | cut -d':' -f 1)" + if [ ! -x "${METHODSDIR}/${PROTO}" ]; then + msgwarn "can not find ${METHODSDIR}/${PROTO}" + return 1 + fi local DOWNLOG="${TMPWORKINGDIRECTORY}/download.log" rm -f "$DOWNLOG" touch "$DOWNLOG" @@ -963,7 +967,7 @@ Filename: ${2} break fi done - } | LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/methods/${PROTO} 2>&1 | tee "$DOWNLOG" + } | LD_LIBRARY_PATH=${BUILDDIRECTORY} ${METHODSDIR}/${PROTO} 2>&1 | tee "$DOWNLOG" rm "$DOWNLOG" # only if the file exists the download was successful if [ -e "$2" ]; then