scripts: try the mirror even if downloads are forbidden

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

2 files changed, 35 insertions, 22 deletions

diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index 509a74b..463a642 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -509,27 +509,23 @@ if [ -z "${CT_RESTART}" ]; then
 fi
 
 if [ -z "${CT_RESTART}" ]; then
-    if [ "${CT_FORBID_DOWNLOAD}" = "y" ]; then
-        CT_DoLog INFO "Downloading forbidden by configuration, skipping downloads"
-    else
-        CT_DoStep INFO "Retrieving needed toolchain components' tarballs"
-        do_companion_tools_get
-        do_kernel_get
-        do_gmp_get
-        do_mpfr_get
-        do_ppl_get
-        do_cloog_get
-        do_mpc_get
-        do_libelf_get
-        do_binutils_get
-        do_elf2flt_get
-        do_sstrip_get
-        do_cc_get
-        do_libc_get
-        do_debug_get
-        do_test_suite_get
-        CT_EndStep
-    fi
+    CT_DoStep INFO "Retrieving needed toolchain components' tarballs"
+    do_companion_tools_get
+    do_kernel_get
+    do_gmp_get
+    do_mpfr_get
+    do_ppl_get
+    do_cloog_get
+    do_mpc_get
+    do_libelf_get
+    do_binutils_get
+    do_elf2flt_get
+    do_sstrip_get
+    do_cc_get
+    do_libc_get
+    do_debug_get
+    do_test_suite_get
+    CT_EndStep
 
     if [ "${CT_ONLY_DOWNLOAD}" != "y" ]; then
         if [ "${CT_FORCE_EXTRACT}" = "y" ]; then
diff --git a/scripts/functions b/scripts/functions
index 24bebb4..b95879c 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -540,7 +540,9 @@ CT_GetFile() {
         URLS+=( "${CT_MIRROR_BASE_URL}" )
     fi
 
-    URLS+=( "${@}" )
+    if [ "${CT_FORBID_DOWNLOAD}" != "y" ]; then
+        URLS+=( "${@}" )
+    fi
 
     # Scan all URLs in turn, and try to grab a tarball from there
     # Do *not* try git trees (ext=/.git), this is handled in a specific
@@ -588,6 +590,11 @@ CT_GetCVS() {
         return 0
     fi
 
+    if [ "${CT_FORBID_DOWNLOAD}" = "y" ]; then
+        CT_DoLog WARN "Downloads forbidden, not trying cvs retrieval"
+        return 1
+    fi
+
     CT_MktempDir tmp_dir
     CT_Pushd "${tmp_dir}"
 
@@ -627,6 +634,11 @@ CT_GetSVN() {
         return 0
     fi
 
+    if [ "${CT_FORBID_DOWNLOAD}" = "y" ]; then
+        CT_DoLog WARN "Downloads forbidden, not trying svn retrieval"
+        return 1
+    fi
+
     CT_MktempDir tmp_dir
     CT_Pushd "${tmp_dir}"
 
@@ -652,6 +664,11 @@ CT_GetGit() {
     local url
     local cloned=0
 
+    if [ "${CT_FORBID_DOWNLOAD}" = "y" ]; then
+        CT_DoLog WARN "Downloads forbidden, not trying git retrieval"
+        return 1
+    fi
+
     # Do we have it in our tarballs dir?
     if [ -d "${CT_TARBALLS_DIR}/${basename}/.git" ]; then
         CT_DoLog EXTRA "Updating git tree '${basename}'"