Merge lp:~james-w/linaro-image-tools/obey-include-debs into lp:linaro-image-tools/11.11

[James Westby]

Hi,

Here's the followup branch that actually obeys the include-debs setting.

We pass the include-debs setting as the new download_content parameter
that just determines if we fetch the contents, or just the metadata.

We tested that passing content=None FetchedPackages to that method in the
last branch, so this is just about plumbing the right bits together.

Thanks,

James

[James Westby (james-w)]

I had a good idea to make this simpler.

Thanks,

James

[Zygmunt Krynicki (zyga)]

Looks fine to me.

review: Approve

[lp:~james-w/linaro-image-tools/obey-include-debs]

155. By James Westby on 2010-09-14

Merged make-package-content-optional into obey-include-debs.

=== modified file 'hwpack/builder.py'
--- hwpack/builder.py	2010-09-03 15:14:32 +0000
+++ hwpack/builder.py	2010-09-14 02:33:51 +0000
@@ -36,7 +36,9 @@
             fetcher = PackageFetcher(
                 sources.values(), architecture=architecture)
             with fetcher:
-                packages = fetcher.fetch_packages(self.config.packages)
+                packages = fetcher.fetch_packages(
+                    self.config.packages,
+                    download_content=self.config.include_debs)
                 hwpack.add_packages(packages)
                 with open(hwpack.filename(), 'w') as f:
                     hwpack.to_file(f)

=== modified file 'hwpack/packages.py'
--- hwpack/packages.py	2010-09-14 02:33:50 +0000
+++ hwpack/packages.py	2010-09-14 02:33:51 +0000
@@ -359,11 +359,14 @@
         self.cleanup()
         return False
 
-    def fetch_packages(self, packages):
+    def fetch_packages(self, packages, download_content=True):
         """Fetch the files for the given list of package names.
 
         :param packages: a list of package names to install
         :type packages: an iterable of str
+        :param download_content: whether to download the content of the
+            packages. Default is to do so.
+        :type download_content: bool
         :return: a list of the packages that were fetched, with relevant
             metdata and the contents of the files available.
         :rtype: an iterable of FetchedPackages.
@@ -374,17 +377,18 @@
         for package in packages:
             candidate = self.cache.cache[package].candidate
             base = os.path.basename(candidate.filename)
-            destfile = os.path.join(self.cache.tempdir, base)
-            acq = apt_pkg.Acquire(DummyProgress())
-            acqfile = apt_pkg.AcquireFile(
-                acq, candidate.uri, candidate.md5, candidate.size,
-                base, destfile=destfile)
-            acq.run()
-            if acqfile.status != acqfile.STAT_DONE:
-                raise FetchError(
-                    "The item %r could not be fetched: %s" %
-                    (acqfile.destfile, acqfile.error_text))
-            result_package = FetchedPackage.from_apt(
-                candidate, base, open(destfile))
+            result_package = FetchedPackage.from_apt(candidate, base)
+            if download_content:
+                destfile = os.path.join(self.cache.tempdir, base)
+                acq = apt_pkg.Acquire(DummyProgress())
+                acqfile = apt_pkg.AcquireFile(
+                    acq, candidate.uri, candidate.md5, candidate.size,
+                    base, destfile=destfile)
+                acq.run()
+                if acqfile.status != acqfile.STAT_DONE:
+                    raise FetchError(
+                        "The item %r could not be fetched: %s" %
+                        (acqfile.destfile, acqfile.error_text))
+                result_package.set_content(open(destfile))
             results.append(result_package)
         return results

=== modified file 'hwpack/tests/test_builder.py'
--- hwpack/tests/test_builder.py	2010-09-02 21:31:22 +0000
+++ hwpack/tests/test_builder.py	2010-09-14 02:33:51 +0000
@@ -72,3 +72,28 @@
             IsHardwarePack(
                 metadata, [available_package],
                 {source_id: source.sources_entry}))
+
+    def test_obeys_include_debs(self):
+        hwpack_name = "ahwpack"
+        hwpack_version = "1.0"
+        architecture = "armel"
+        package_name = "foo"
+        source_id = "ubuntu"
+        available_package = DummyFetchedPackage(
+            package_name, "1.1", architecture=architecture)
+        source = self.useFixture(AptSourceFixture([available_package]))
+        config = self.useFixture(ConfigFileFixture(
+            '[hwpack]\nname=%s\npackages=%s\narchitectures=%s\n'
+            'include-debs=no\n\n[%s]\nsources-entry=%s\n'
+            % (hwpack_name, package_name, architecture,
+                source_id, source.sources_entry)))
+        builder = HardwarePackBuilder(config.filename, hwpack_version)
+        builder.build()
+        metadata = Metadata(hwpack_name, hwpack_version, architecture)
+        self.assertThat(
+            "hwpack_%s_%s_%s.tar.gz" % (hwpack_name, hwpack_version,
+                architecture),
+            IsHardwarePack(
+                metadata, [available_package],
+                {source_id: source.sources_entry},
+                packages_without_content=[available_package]))

=== modified file 'hwpack/tests/test_packages.py'
--- hwpack/tests/test_packages.py	2010-09-14 02:33:50 +0000
+++ hwpack/tests/test_packages.py	2010-09-14 02:33:51 +0000
@@ -653,3 +653,11 @@
         fetcher = self.get_fetcher([source])
         self.assertEqual(
             wanted_package, fetcher.fetch_packages(["foo"])[0])
+
+    def test_fetch_packages_download_content_False_doesnt_set_content(self):
+        available_package = DummyFetchedPackage("foo", "1.0")
+        source = self.useFixture(AptSourceFixture([available_package]))
+        fetcher = self.get_fetcher([source])
+        fetched_package = fetcher.fetch_packages(
+            ["foo"], download_content=False)[0]
+        self.assertIs(None, fetched_package.content)