diff -r f97f88662587 -r b6495ef0193c scripts/functions --- a/scripts/functions Fri Apr 08 00:08:57 2011 +0200 +++ b/scripts/functions Mon May 30 23:24:11 2011 +0200 @@ -426,7 +426,7 @@ # to find the requested URL (think about snapshots, different layouts # for different gcc versions, etc...). CT_DoGetFile() { - local dest="${1##*/}" + local dest="${1}" local tmp="${dest}.tmp-dl" # OK, just look if we have them... # We are sure at least one is available, ./configure checked for it. @@ -530,7 +530,6 @@ # Try to retrieve the file CT_DoLog EXTRA "Retrieving '${file}'" - CT_Pushd "${CT_TARBALLS_DIR}" URLS="$@" @@ -558,16 +557,18 @@ for url in ${URLS}; do CT_DoLog DEBUG "Trying '${url}/${file}${ext}'" CT_DoGetFile "${url}/${file}${ext}" - if [ -f "${file}${ext}" ]; then + if [ -f "${CT_TARBALLS_DIR}/${file}${ext}" ]; then CT_DoLog DEBUG "Got '${file}' from the Internet" CT_SaveLocal "${CT_TARBALLS_DIR}/${file}${ext}" return 0 fi done done - CT_Popd - CT_Abort "Could not retrieve '${file}'." + # Just warn, someone may want to catch and handle the error + # (eg. glibc/eglibc add-ons can be missing). + CT_DoLog WARN "Could not retrieve '${file}'." + return 1 } # Checkout from CVS, and build the associated tarball