From d09b55decd4ffac0da6875e4d9ae4fad57387dc0 Mon Sep 17 00:00:00 2001 From: lxnay Date: Tue, 3 Jun 2008 09:33:34 +0000 Subject: [PATCH] Entropy/RepoInterface: - fix internet connection check git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2096 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/entropyTools.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libraries/entropyTools.py b/libraries/entropyTools.py index db48e03a9..e67bc4844 100644 --- a/libraries/entropyTools.py +++ b/libraries/entropyTools.py @@ -149,8 +149,13 @@ def get_remote_data(url): socket.setdefaulttimeout(60) # now pray the server try: - if etpConst['proxy']: - proxy_support = urllib2.ProxyHandler(etpConst['proxy']) + mydict = {} + if etpConst['proxy']['ftp']: + mydict['ftp'] = etpConst['proxy']['ftp'] + if etpConst['proxy']['http']: + mydict['http'] = etpConst['proxy']['http'] + if mydict: + proxy_support = urllib2.ProxyHandler(mydict) opener = urllib2.build_opener(proxy_support) urllib2.install_opener(opener) item = urllib2.urlopen(url)