Merge lp:~james-w/linaro-image-tools/metadata-from-config into lp:linaro-image-tools/11.11

[James Westby]

Hi,

A tiny branch to add a second constructor for Metdadata objects that
allows them to be created from their cousin, the Config object,
with a couple of other items specified.

Version doesn't go in the config, so has to be specified externally.

While architectures are in the configuration, we want to select a
single one for the particular hardware pack that is being built.

Thanks,

James

[lp:~james-w/linaro-image-tools/metadata-from-config]

109. By James Westby on 2010-09-02

Add a docstring for from_config.

110. By James Westby on 2010-09-02

Merged architectures-from-config into metadata-from-config.

[Michael Hudson-Doyle (mwhudson)]

You could check that the supplied architecture is in the config. Otherwise fine.

review: Approve

[James Westby (james-w)]

On Fri, 03 Sep 2010 05:07:42 -0000, Michael Hudson <email address hidden> wrote:
> Review: Approve
> You could check that the supplied architecture is in the config. Otherwise fine.

I wanted to avoid that, as there may be an option in the future to force
building for a different architecture than the config specifies, so I
went with the simpler code.

Thanks,

James

=== modified file 'hwpack/hardwarepack.py'
--- hwpack/hardwarepack.py	2010-09-02 23:07:48 +0000
+++ hwpack/hardwarepack.py	2010-09-02 23:07:48 +0000
@@ -39,6 +39,28 @@
         self.support = support
         self.architecture = architecture
 
+    @classmethod
+    def from_config(cls, config, version, architecture):
+        """Create a Metadata from a Config object.
+
+        As a Config will contain most of the information needed for a
+        Metadata, we can provide this convenient way to construct one.
+
+        Information that is not in the config has to be provided by
+        the caller.
+
+        :param config: the config to take values from.
+        :type config: Config
+        :param version: the version to record in the metadata.
+        :type version: str
+        :param architecture: the architecture that the hardware pack is
+            targetting.
+        :type architecture: str
+        """
+        return cls(
+            config.name, version, architecture, origin=config.origin,
+            maintainer=config.maintainer, support=config.support)
+
     def __str__(self):
         """Get the contents of the metadata file."""
         metadata = "NAME=%s\n" % self.name

=== modified file 'hwpack/tests/test_hardwarepack.py'
--- hwpack/tests/test_hardwarepack.py	2010-09-02 23:07:48 +0000
+++ hwpack/tests/test_hardwarepack.py	2010-09-02 23:07:48 +0000
@@ -74,6 +74,21 @@
             "SUPPORT=unsupported\n",
             str(metadata))
 
+    def test_from_config(self):
+        class Config:
+            name = "foo"
+            origin = "linaro"
+            maintainer = "someone"
+            support = "supported"
+        config = Config()
+        metadata = Metadata.from_config(config, "2.0", "i386")
+        self.assertEqual(config.name, metadata.name)
+        self.assertEqual(config.origin, metadata.origin)
+        self.assertEqual(config.maintainer, metadata.maintainer)
+        self.assertEqual(config.support, metadata.support)
+        self.assertEqual("2.0", metadata.version)
+        self.assertEqual("i386", metadata.architecture)
+
 
 class HardwarePackHasFile(TarfileHasFile):
     """A subclass of TarfileHasFile specific to hardware packs.