ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2024-12-19 12:57:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't print anything about LAN mirror if it is not used.

Browse Source 
Don't re-compute a variable that has already been computed.

 /trunk/scripts/functions |   16     9     7     0 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
This commit is contained in:
Yann E. MORIN" 2009-01-12 18:54:34 +00:00
parent 3b804296f5
commit 4732188b21
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/functions
View File

@ -452,7 +452,7 @@ CT_SaveLocal() {
local basename="${file##*/}" local basename="${file##*/}"
if [ "${CT_SAVE_TARBALLS}" = "y" ]; then if [ "${CT_SAVE_TARBALLS}" = "y" ]; then
CT_DoLog EXTRA "Saving '${file##*/}' to local storage" CT_DoLog EXTRA "Saving '${basename}' to local storage"
# The file may already exist if downloads are forced: remove it first # The file may already exist if downloads are forced: remove it first
CT_DoExecLog ALL rm -f "${CT_LOCAL_TARBALLS_DIR}/${basename}" CT_DoExecLog ALL rm -f "${CT_LOCAL_TARBALLS_DIR}/${basename}"
CT_DoExecLog ALL mv -f "${file}" "${CT_LOCAL_TARBALLS_DIR}" CT_DoExecLog ALL mv -f "${file}" "${CT_LOCAL_TARBALLS_DIR}"
@ -490,17 +490,18 @@ CT_GetFile() {
# Add URLs on the LAN mirror # Add URLs on the LAN mirror
LAN_URLS= LAN_URLS=
if [ "${CT_USE_MIRROR}" = "y" ]; then if [ "${CT_USE_MIRROR}" = "y" ]; then
CT_DoLog DEBUG "Trying to retrieve a copy of '${file}' from LAN mirror '${CT_MIRROR_HOSTNAME}'"
CT_TestOrAbort "Please set the LAN mirror hostname" -n "${CT_MIRROR_HOSTNAME}" CT_TestOrAbort "Please set the LAN mirror hostname" -n "${CT_MIRROR_HOSTNAME}"
CT_TestOrAbort "Please tell me where to find tarballs on the LAN mirror '${CT_MIRROR_HOSTNAME}'" -n "${CT_MIRROR_BASE}" CT_TestOrAbort "Please tell me where to find tarballs on the LAN mirror '${CT_MIRROR_HOSTNAME}'" -n "${CT_MIRROR_BASE}"
LAN_URLS="${LAN_URLS} ${CT_MIRROR_SCHEME}://${CT_MIRROR_HOSTNAME}/${CT_MIRROR_BASE}/${file%-*}" LAN_URLS="${LAN_URLS} ${CT_MIRROR_SCHEME}://${CT_MIRROR_HOSTNAME}/${CT_MIRROR_BASE}/${file%-*}"
LAN_URLS="${LAN_URLS} ${CT_MIRROR_SCHEME}://${CT_MIRROR_HOSTNAME}/${CT_MIRROR_BASE}" LAN_URLS="${LAN_URLS} ${CT_MIRROR_SCHEME}://${CT_MIRROR_HOSTNAME}/${CT_MIRROR_BASE}"
fi
if [ "${CT_PREFER_MIRROR}" = "y" ]; then if [ "${CT_PREFER_MIRROR}" = "y" ]; then
URLS="${LAN_URLS} ${@}" CT_DoLog DEBUG "Pre-pending LAN mirror URLs"
else URLS="${LAN_URLS} ${@}"
URLS="${@} ${LAN_URLS}" else
CT_DoLog DEBUG "Appending LAN mirror URLs"
URLS="${@} ${LAN_URLS}"
fi
fi fi
# Scan all URLs in turn, and try to grab a tarball from there # Scan all URLs in turn, and try to grab a tarball from there
@ -765,6 +766,7 @@ CT_DoSaveState() {
local state_dir="${CT_STATE_DIR}/${state_name}" local state_dir="${CT_STATE_DIR}/${state_name}"
CT_DoLog DEBUG "Saving state to restart at step '${state_name}'..." CT_DoLog DEBUG "Saving state to restart at step '${state_name}'..."
rm -rf "${state_dir}" rm -rf "${state_dir}"
mkdir -p "${state_dir}" mkdir -p "${state_dir}"