]> git.ipfire.org Git - people/ms/pakfire.git/commitdiff
Use the HTTP proxy for HTTPS as well.
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 20 Feb 2013 17:01:08 +0000 (18:01 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 20 Feb 2013 17:01:08 +0000 (18:01 +0100)
python/pakfire/client/transport.py
python/pakfire/downloader.py

index ac7de8d78f9024fbbd2b62f40504c8811230bae2..319c48cfc29112dcb48b66381a7dd1b9986cb356 100644 (file)
@@ -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
 
index 6eefeae54209e1201043fbfdd0fa9776dd7dc553..2315fca0b423bb1631420fef41386fd9f003e720 100644 (file)
@@ -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)