From bf464ed3feadd20b08f602be182ec113bb8dbae4 Mon Sep 17 00:00:00 2001 From: Zhang Qiang Date: Thu, 8 Aug 2013 21:20:47 +0800 Subject: [PATCH] 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 --- plugins/backend/zypppkgmgr.py | 2 ++ 1 file changed, 2 insertions(+) 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) -- 2.7.4