From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 20 Feb 2013 17:01:08 +0000 (+0100)
Subject: Use the HTTP proxy for HTTPS as well.
X-Git-Tag: 0.9.25~14
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fpakfire.git;a=commitdiff_plain;h=c611f46b214a2bc07667200f5ae5e599291e9cf1

Use the HTTP proxy for HTTPS as well.
---

diff --git a/python/pakfire/client/transport.py b/python/pakfire/client/transport.py
index ac7de8d7..319c48cf 100644
--- a/python/pakfire/client/transport.py
+++ b/python/pakfire/client/transport.py
@@ -34,6 +34,9 @@ from pakfire.i18n import _
 # Set the default socket timeout to 30 seconds.
 socket.setdefaulttimeout(30)
 
+
+
+
 class XMLRPCMixin:
 	user_agent = "pakfire/%s" % PAKFIRE_VERSION
 
diff --git a/python/pakfire/downloader.py b/python/pakfire/downloader.py
index 6eefeae5..2315fca0 100644
--- a/python/pakfire/downloader.py
+++ b/python/pakfire/downloader.py
@@ -68,7 +68,7 @@ class PakfireGrabber(URLGrabber):
 		# Configure HTTP proxy.
 		http_proxy = config.get("downloader", "http_proxy")
 		if http_proxy:
-			kwargs.update({ "proxies" : { "http" : http_proxy }})
+			kwargs.update({ "proxies" : { "http" : http_proxy, "https" : http_proxy }})
 
 		URLGrabber.__init__(self, *args, **kwargs)