From 5c7717787300951329763f1c82d6f7a1df1af260 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 9 Aug 2008 20:48:39 +0000
Subject: 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(-)

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
-- 
cgit v0.10.2-6-g49f6