Merge lp:~mvo/snapcraft/lp1498333-even-more-apt into lp:~snappy-dev/snapcraft/core

[Michael Vogt]

Fetch all packages in a single download run with proper progress

This branch will do all the fetching in a single go to get accurate
download progress reporting.

[Daniel Holbach (dholbach)]

Two small typos, apart from that great work!

review: Approve

[lp:~mvo/snapcraft/lp1498333-even-more-apt]

193. By Michael Vogt on 2015-09-22

fix two typos (one is not even from me ;). Thanks dholbach!

[Daniel Holbach (dholbach)]

Thanks. Approved.

review: Approve

=== modified file 'snapcraft/repo.py'
--- snapcraft/repo.py	2015-09-21 15:21:15 +0000
+++ snapcraft/repo.py	2015-09-22 08:12:26 +0000
@@ -78,18 +78,26 @@
             except KeyError:
                 raise PackageNotFoundError(name)
 
+        # unmark some base packages here
+        # note that this will break the consistency check inside apt_cache
+        # (self.apt_cache.broken_count will be > 0)
+        # but that is ok as it was consistent before we excluded
+        # these base package
         for pkg in self.apt_cache:
             # those should be already on each system, it also prevents
             # diving into downloading libc6
             if (pkg.candidate.priority in 'essential' and
                pkg.name not in package_names):
-                print('Skipping priority essential/imporant %s' % pkg.name)
+                print('Skipping priority essential/important %s' % pkg.name)
+                pkg.mark_keep()
                 continue
             if (pkg.name in manifest_dep_names and pkg.name not in package_names):
                 print('Skipping blacklisted from manifest package %s' % pkg.name)
+                pkg.mark_keep()
                 continue
-            if pkg.marked_install:
-                pkg.candidate.fetch_binary(destdir=self.downloaddir)
+        # download the remaining ones with proper progress
+        apt.apt_pkg.config.set("Dir::Cache::Archives", self.downloaddir)
+        self.apt_cache.fetch_archives()
 
     def unpack(self, rootdir):
         pkgs_abs_path = glob.glob(os.path.join(self.downloaddir, '*.deb'))