From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 7 Dec 2012 14:10:47 +0000 (+0100)
Subject: Use urlgrab method for urlgrabber download.
X-Git-Tag: 0.9.24~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66a0a465a76873dcac6985b58edfddbc7d597095;p=pakfire.git

Use urlgrab method for urlgrabber download.
---

diff --git a/python/pakfire/repository/local.py b/python/pakfire/repository/local.py
index 2610bc0fc..d9a0011a6 100644
--- a/python/pakfire/repository/local.py
+++ b/python/pakfire/repository/local.py
@@ -94,32 +94,18 @@ class RepositoryDir(base.RepositoryFactory):
 		return files
 
 	def download_package(self, url):
-		basename = os.path.basename(url)
-
-		grabber = downloader.PackageDownloader(self.pakfire, text=basename)
-
-		try:
-			download = grabber.urlopen(url)
-		except urlgrabber.grabber.URLGrabError, e:
-			raise DownloadError, _("Could not download %s: %s") % (url, e)
+		grabber = downloader.PackageDownloader(self.pakfire)
 
 		tmpfile = None
 		try:
 			tmpfile = tempfile.NamedTemporaryFile(mode="wb", delete=False)
-
-			while True:
-				buf = download.read(BUFFER_SIZE)
-				if not buf:
-					break
-
-				tmpfile.write(buf)
-
 			tmpfile.close()
-			download.close()
+
+			basename = os.path.basename(url)
+			grabber.urlgrab(url, filename=tmpfile.name, text=basename)
 
 			# Add the package to the repository.
 			self.add_package(tmpfile.name)
-
 		finally:
 			# Delete the temporary file afterwards.
 			# Ignore any errors.