]> git.ipfire.org Git - pakfire.git/commitdiff
Fix downloading files twice.
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 6 Feb 2012 01:17:38 +0000 (20:17 -0500)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 6 Feb 2012 01:17:38 +0000 (20:17 -0500)
python/pakfire/downloader.py
python/pakfire/packages/make.py

index f7f29c49e4288d442e7517f7e395945247f26fcd..baa243e553d08f81d96edfc755ac90b6420e0ca2 100644 (file)
@@ -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:
index d93c694c00f01e1c893ca0d5a4c06132d440cf82..7c946ce68a58c329a73f01c14528a54152559794 100644 (file)
@@ -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)