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(-)
1.1 --- a/scripts/functions Sat Aug 09 17:48:13 2008 +0000
1.2 +++ b/scripts/functions Sat Aug 09 20:48:39 2008 +0000
1.3 @@ -308,14 +308,10 @@
1.4 CT_DoLog DEBUG "http_proxy='${http_proxy}'"
1.5 ;;
1.6 sockssys)
1.7 - # Force not using HTTP proxy
1.8 - unset http_proxy ftp_proxy https_proxy
1.9 CT_HasOrAbort tsocks
1.10 . tsocks -on
1.11 ;;
1.12 socks*)
1.13 - # Force not using HTTP proxy
1.14 - unset http_proxy ftp_proxy https_proxy
1.15 # Remove any lingering config file from any previous run
1.16 rm -f "${CT_BUILD_DIR}/tsocks.conf"
1.17 # Find all interfaces and build locally accessible networks
1.18 @@ -447,6 +443,8 @@
1.19 ;;
1.20 esac
1.21
1.22 + CT_DoLog EXTRA "Retrieving '${file}'"
1.23 +
1.24 # Do we already have it?
1.25 ext=$(CT_GetFileExtension "${file}" ${first_ext})
1.26 if [ -n "${ext}" ]; then