From cc2cc14ffbd6755df7105a75f0e95d1a0d6d9e4c Mon Sep 17 00:00:00 2001 From: Gui Chen Date: Mon, 10 Sep 2012 21:02:00 +0800 Subject: [PATCH] proxy setting to be compatible with old version of yum Signed-off-by: Gui Chen --- plugins/backend/yumpkgmgr.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/backend/yumpkgmgr.py b/plugins/backend/yumpkgmgr.py index 063bad4..90f9c77 100644 --- a/plugins/backend/yumpkgmgr.py +++ b/plugins/backend/yumpkgmgr.py @@ -73,11 +73,13 @@ class MyYumRepository(yum.yumRepo.YumRepository): M2Crypto.SSL.Connection.clientPostConnectionCheck = None proxy = None - proxies = None if url: proxy = get_proxy_for(url) + else: + proxy = get_proxy_for(self.urls[0]) + if proxy: - proxies = {str(url.split(':')[0]): str(proxy)} + self.proxy = str(proxy) size = int(size) if size else None rvalue = super(MyYumRepository, self)._getFile(url, @@ -90,8 +92,7 @@ class MyYumRepository(yum.yumRepo.YumRepository): text, reget, cache, - size, - proxies=proxies) + size) if m2c_connection and \ not M2Crypto.SSL.Connection.clientPostConnectionCheck: -- 2.7.4