From 15bde07c864366a4c6ec12ddaf6587f9ee081a64 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 12 Aug 2012 07:45:42 -0400 Subject: scripts: add option to only use the mirror Currently, if downloads are forbidden, the mirror is still tried for. Change this way: - if downlaods forbidden, do not try neither upstream locations nor mirror - add option to only use the mirror, and avoid upstream locations Signed-off-by: Austin Morton [yann.morin.1998@free.fr: broaden the if USE_MIRRORto enclode mirror location] Signed-off-by: "Yann E. MORIN" --- scripts/functions | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'scripts/functions') diff --git a/scripts/functions b/scripts/functions index 4a91f7d8..9bbc753a 100644 --- a/scripts/functions +++ b/scripts/functions @@ -555,6 +555,12 @@ CT_GetFile() { fi # No, it does not... + # If not allowed to download from the Internet, don't + if [ "${CT_FORBID_DOWNLOAD}" = "y" ]; then + CT_DoLog DEBUG "Not allowed to download from the Internet, aborting ${file} download" + return 1 + fi + # Try to retrieve the file CT_DoLog EXTRA "Retrieving '${file}'" @@ -565,7 +571,7 @@ CT_GetFile() { URLS+=( "${CT_MIRROR_BASE_URL}" ) fi - if [ "${CT_FORBID_DOWNLOAD}" != "y" ]; then + if [ "${CT_FORCE_MIRROR}" != "y" ]; then URLS+=( "${@}" ) fi -- cgit v1.2.3