diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-08-09 20:48:39 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-08-09 20:48:39 (GMT) |
| commit | 5c7717787300951329763f1c82d6f7a1df1af260 (patch) | |
| tree | ac31e6a6865ef3ad8fc3f3141ef345e27f9da6f3 /scripts/functions | |
| parent | dfad0fbd2f97b73c9f9b4e835dd6de513e3ae654 (diff) | |
Do not unset http_proxy, ftp_proxy and https_proxy in case of using a socks proxy.
Add a log message.
/trunk/scripts/functions | 6 2 4 0 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
Diffstat (limited to 'scripts/functions')
| -rw-r--r-- | scripts/functions | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/functions b/scripts/functions index 7c4d7b9..e65fddf 100644 --- a/scripts/functions +++ b/scripts/functions @@ -308,14 +308,10 @@ CT_DoSetProxy() { CT_DoLog DEBUG "http_proxy='${http_proxy}'" ;; sockssys) - # Force not using HTTP proxy - unset http_proxy ftp_proxy https_proxy CT_HasOrAbort tsocks . tsocks -on ;; socks*) - # Force not using HTTP proxy - unset http_proxy ftp_proxy https_proxy # Remove any lingering config file from any previous run rm -f "${CT_BUILD_DIR}/tsocks.conf" # Find all interfaces and build locally accessible networks @@ -447,6 +443,8 @@ CT_GetFile() { ;; esac + CT_DoLog EXTRA "Retrieving '${file}'" + # Do we already have it? ext=$(CT_GetFileExtension "${file}" ${first_ext}) if [ -n "${ext}" ]; then |