Merge lp:~james-w/linaro-image-tools/install-recommends into lp:linaro-image-tools/11.11

[James Westby]

Installing recommends was platform dependent before. Now that
we want to install them, ensure that we do that everywhere.

Thanks,

James

[Steve Langasek (vorlon)]

I believe this is a correct change.

- unlike images, some of which we may want to exclude recommends from because we need to hit a particular disk footprint target, in hwpacks if recommends pulls in unwanted packages we can much more easily (due to questions of scale) change the packages to just not recommend that package anymore.
- installing recommends is always the sensible default given the definition of recommends, and should only be overridden in a case-by-case basis when we know there's a reason to do so.
- certainly as regards the present case of the linux image packages recommending uboot-mkimage and flash-kernel, it's my understanding that the model we're working towards is precisely one where these components should be associated with the hwpacks, not the images.

So this has a +1 from me.

I understand this will also supersede the merge request at <https://code.launchpad.net/~james-w/linaro-image-tools/no-install-recommends/+merge/40106>.

review: Approve

=== modified file 'hwpack/packages.py'
--- hwpack/packages.py	2010-09-24 20:00:05 +0000
+++ hwpack/packages.py	2010-11-04 16:33:41 +0000
@@ -297,7 +297,9 @@
         if self.architecture is not None:
             apt_conf = os.path.join(self.tempdir, "etc", "apt", "apt.conf")
             with open(apt_conf, 'w') as f:
-                f.write('Apt {\nArchitecture "%s";\n}\n' % self.architecture)
+                f.write(
+                    'Apt {\nArchitecture "%s";\n'
+                    'Install-Recommends "true";\n}\n' % self.architecture)
         self.cache = Cache(rootdir=self.tempdir, memonly=True)
         self.cache.update()
         self.cache.open()

=== modified file 'hwpack/tests/test_packages.py'
--- hwpack/tests/test_packages.py	2010-09-15 19:13:06 +0000
+++ hwpack/tests/test_packages.py	2010-11-04 16:33:41 +0000
@@ -563,7 +563,7 @@
         self.addCleanup(cache.cleanup)
         cache.prepare()
         self.assertEqual(
-            'Apt {\nArchitecture "arch";\n}\n',
+            'Apt {\nArchitecture "arch";\nInstall-Recommends "true";\n}\n',
             open(os.path.join(
                 cache.tempdir, "etc", "apt", "apt.conf")).read())
 
@@ -749,6 +749,16 @@
             [wanted_package1, wanted_package2],
             fetcher.fetch_packages(["foo"]))
 
+    def test_fetches_recommends(self):
+        wanted_package1 = DummyFetchedPackage("foo", "1.0", recommends="bar")
+        wanted_package2 = DummyFetchedPackage("bar", "1.0")
+        source = self.useFixture(
+            AptSourceFixture([wanted_package1, wanted_package2]))
+        fetcher = self.get_fetcher([source])
+        self.assertEqual(
+            [wanted_package1, wanted_package2],
+            fetcher.fetch_packages(["foo"]))
+
     def test_broken_dependencies(self):
         wanted_package = DummyFetchedPackage("foo", "1.0", depends="bar")
         source = self.useFixture(AptSourceFixture([wanted_package]))