scripts/functions: always prefer the mirror

Currently, the mirror can be used either:
 - as a fallback in case upstream is unavailable (default behavior)
 - as the preferred source for downloads

But the most common use-case seems to provide a truely-LAN mirror
to speed up downloads in big corpos', and/or provide a 'trusted'
source for the tarballs.

So, make the following changes;
 - if a mirror is specified, always try that before trying upstream

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

1 files changed, 1 insertions, 10 deletions

diff --git a/config/global/download.in b/config/global/download.in
index b6783749..801d06bf 100644
--- a/config/global/download.in
+++ b/config/global/download.in
@@ -37,17 +37,10 @@ config USE_MIRROR
       *not* on your LAN, for example on another subnet of your company's
       network, or a mirror on the Internet.
 
-if USE_MIRROR
-
-config PREFER_MIRROR
-    bool
-    prompt "Prefer the mirror"
-    help
-      Say 'Y' here if you prefer the LAN mirror over the upstream sources.
-
 config MIRROR_BASE_URL
     string
     prompt "Base URL"
+    depends on USE_MIRROR
     default "http://ymorin.is-a-geek.org/mirrors/"
     help
       This is the base URL searched in for tarballs.
@@ -63,8 +56,6 @@ config MIRROR_BASE_URL
       The mirror is available at:
         http://ymorin.is-a-geek.org/mirrors/
 
-endif # USE_MIRROR
-
 config CONNECT_TIMEOUT
     int
     prompt "Connection timeout"