From: Michael Tremer Date: Mon, 6 Feb 2012 01:17:38 +0000 (-0500) Subject: Fix downloading files twice. X-Git-Tag: 0.9.20~14^2^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b76f5f47f5da667568bca274b20d29c002dbf66a;p=pakfire.git Fix downloading files twice. --- diff --git a/python/pakfire/downloader.py b/python/pakfire/downloader.py index f7f29c49e..baa243e55 100644 --- a/python/pakfire/downloader.py +++ b/python/pakfire/downloader.py @@ -124,10 +124,13 @@ class SourceDownloader(object): for file in files: filename = os.path.join(SOURCE_CACHE_DIR, file) + log.debug("Checking existance of %s..." % filename) if os.path.exists(filename) and os.path.getsize(filename): + log.debug("...exists!") existant_files.append(filename) else: + log.debug("...does not exist!") download_files.append(filename) if download_files: @@ -138,8 +141,6 @@ class SourceDownloader(object): os.makedirs(SOURCE_CACHE_DIR) for filename in download_files: - self.grabber.urlgrab(os.path.basename(filename), filename=filename) - try: self.grabber.urlgrab(os.path.basename(filename), filename=filename) except URLGrabError, e: diff --git a/python/pakfire/packages/make.py b/python/pakfire/packages/make.py index d93c694c0..7c946ce68 100644 --- a/python/pakfire/packages/make.py +++ b/python/pakfire/packages/make.py @@ -245,9 +245,6 @@ class Makefile(MakefileBase): """ Create a source package. """ - # Download all files we need for this package. - self.download() - p = packager.SourcePackager(self.pakfire, self) p.run(resultdirs)