Merge lp:~sergiusens/snapcraft/printless into lp:~snappy-dev/snapcraft/core

[Sergio Schvezov]

Show skipped packages only once per filter

[John Lenton (chipaca)]

review: Approve

[lp:~sergiusens/snapcraft/printless]

204. By Sergio Schvezov on 2015-09-23

why join if we can expand?

=== modified file 'snapcraft/repo.py'
--- snapcraft/repo.py	2015-09-22 13:22:57 +0000
+++ snapcraft/repo.py	2015-09-23 14:10:32 +0000
@@ -80,6 +80,9 @@
             except KeyError:
                 raise PackageNotFoundError(name)
 
+        skipped_essential = []
+        skipped_blacklisted = []
+
         # unmark some base packages here
         # note that this will break the consistency check inside apt_cache
         # (self.apt_cache.broken_count will be > 0)
@@ -90,13 +93,19 @@
             # diving into downloading libc6
             if (pkg.candidate.priority in 'essential' and
                pkg.name not in package_names):
-                print('Skipping priority essential/important %s' % pkg.name)
+                skipped_essential.append(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)
+                skipped_blacklisted.append(pkg.name)
                 pkg.mark_keep()
                 continue
+
+        if skipped_essential:
+            print('Skipping priority essential packages:', skipped_essential)
+        if skipped_blacklisted:
+            print('Skipping blacklisted from manifest packages:', skipped_blacklisted)
+
         # download the remaining ones with proper progress
         apt.apt_pkg.config.set("Dir::Cache::Archives", self.downloaddir)
         self.apt_cache.fetch_archives()