diff options
author | Zhang Qiang <qiang.z.zhang@intel.com> | 2013-08-08 21:20:47 +0800 |
---|---|---|
committer | Gerrit Code Review <gerrit2@otctools.jf.intel.com> | 2013-08-14 01:12:53 -0700 |
commit | bf464ed3feadd20b08f602be182ec113bb8dbae4 (patch) | |
tree | 198bbb7ba43933fc77df2a5b983cbbffb41f115a /plugins | |
parent | 96358e74e5a57e250d9d5901b507108ce23ae93a (diff) | |
download | mic-bf464ed3feadd20b08f602be182ec113bb8dbae4.tar.gz mic-bf464ed3feadd20b08f602be182ec113bb8dbae4.tar.bz2 mic-bf464ed3feadd20b08f602be182ec113bb8dbae4.zip |
Disable using proxy from /etc/sysconfig/proxy
Always set 'proxy' query paramer to disable using proxy from
/etc/sysconfig/proxy.
Fixes: #1093
Change-Id: I6a75c9e61bb2b2142c8401036ddd21b85886fa28
Diffstat (limited to 'plugins')
-rwxr-xr-x | plugins/backend/zypppkgmgr.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/backend/zypppkgmgr.py b/plugins/backend/zypppkgmgr.py index a1022fb..01fb503 100755 --- a/plugins/backend/zypppkgmgr.py +++ b/plugins/backend/zypppkgmgr.py @@ -419,6 +419,8 @@ class Zypp(BackendPlugin): baseurl.setQueryParam ("proxyuser", proxy_username) if proxy_password: baseurl.setQueryParam ("proxypass", proxy_password) + else: + baseurl.setQueryParam ("proxy", "_none_") repo.baseurl[0] = baseurl.asCompleteString() self.repos.append(repo) |