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(-)
This commit is contained in:
Yann E. MORIN" 2008-08-09 20:48:39 +00:00
parent dfad0fbd2f
commit 5c77177873

View File

@ -308,14 +308,10 @@ CT_DoSetProxy() {
CT_DoLog DEBUG "http_proxy='${http_proxy}'" CT_DoLog DEBUG "http_proxy='${http_proxy}'"
;; ;;
sockssys) sockssys)
# Force not using HTTP proxy
unset http_proxy ftp_proxy https_proxy
CT_HasOrAbort tsocks CT_HasOrAbort tsocks
. tsocks -on . tsocks -on
;; ;;
socks*) socks*)
# Force not using HTTP proxy
unset http_proxy ftp_proxy https_proxy
# Remove any lingering config file from any previous run # Remove any lingering config file from any previous run
rm -f "${CT_BUILD_DIR}/tsocks.conf" rm -f "${CT_BUILD_DIR}/tsocks.conf"
# Find all interfaces and build locally accessible networks # Find all interfaces and build locally accessible networks
@ -447,6 +443,8 @@ CT_GetFile() {
;; ;;
esac esac
CT_DoLog EXTRA "Retrieving '${file}'"
# Do we already have it? # Do we already have it?
ext=$(CT_GetFileExtension "${file}" ${first_ext}) ext=$(CT_GetFileExtension "${file}" ${first_ext})
if [ -n "${ext}" ]; then if [ -n "${ext}" ]; then