From e57c5475933b83bad3e59b03b58ad37d35c709d9 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 4 Aug 2011 17:35:10 +0200 Subject: [PATCH] Fix server downloader which has no Pakfire reference. --- pakfire/downloader.py | 11 +++++++++-- pakfire/server.py | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pakfire/downloader.py b/pakfire/downloader.py index 7369ddb3..b57f0978 100644 --- a/pakfire/downloader.py +++ b/pakfire/downloader.py @@ -4,6 +4,8 @@ import json import logging import random +from config import Config + from urlgrabber.grabber import URLGrabber, URLGrabError from urlgrabber.mirror import MirrorGroup from urlgrabber.progress import TextMeter @@ -20,8 +22,13 @@ class PakfireGrabber(URLGrabber): "user_agent" : "pakfire/%s" % PAKFIRE_VERSION, }) + if isinstance(pakfire, Config): + config = pakfire + else: + config = pakfire.config + # Set throttle setting. - bandwidth_throttle = pakfire.config.get("bandwidth_throttle") + bandwidth_throttle = config.get("bandwidth_throttle") if bandwidth_throttle: try: bandwidth_throttle = int(bandwidth_throttle) @@ -32,7 +39,7 @@ class PakfireGrabber(URLGrabber): kwargs.update({ "throttle" : bandwidth_throttle }) # Configure HTTP proxy. - http_proxy = pakfire.config.get("http_proxy") + http_proxy = config.get("http_proxy") if http_proxy: kwargs.update({ "proxies" : { "http" : http_proxy }}) diff --git a/pakfire/server.py b/pakfire/server.py index 9d4c2c6f..4a5c0ec1 100644 --- a/pakfire/server.py +++ b/pakfire/server.py @@ -346,7 +346,7 @@ class Server(object): logfile = os.path.join(tmpdir, "build.log") # Get a package grabber and add mirror download capabilities to it. - grabber = pakfire.downloader.PackageDownloader(self.pakfire) + grabber = pakfire.downloader.PackageDownloader(self.config) try: # Download the source. -- 2.39.2