summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-09-12 11:44:11 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-09-12 11:44:11 +0200
commitd73fe42cf042fbc9d8d2b38eb67bd7efaa4be412 (patch)
treef2c65ebd8cf88906b7cae7689525305b6ae8df45 /apt-pkg/contrib
parent7d8a4da74eb7f794e4da1216b39d7e2a1259d18f (diff)
Allow override of Proxy-Auto-Detect by the users configuration
Only run the Proxy-Auto-Detect code if there is not already a host specific configuration. Closes: 759264
Diffstat (limited to 'apt-pkg/contrib')
-rw-r--r--apt-pkg/contrib/proxy.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/apt-pkg/contrib/proxy.cc b/apt-pkg/contrib/proxy.cc
index b58db8478..0c753131d 100644
--- a/apt-pkg/contrib/proxy.cc
+++ b/apt-pkg/contrib/proxy.cc
@@ -26,6 +26,10 @@ bool AutoDetectProxy(URI &URL)
// we support both http/https debug options
bool Debug = _config->FindB("Debug::Acquire::"+URL.Access,false);
+ // the user already explicitly set a proxy for this host
+ if(_config->Find("Acquire::"+URL.Access+"::proxy::"+URL.Host, "") != "")
+ return true;
+
// option is "Acquire::http::Proxy-Auto-Detect" but we allow the old
// name without the dash ("-")
std::string AutoDetectProxyCmd = _config->Find("Acquire::"+URL.Access+"::Proxy-Auto-Detect",