Merge lp:~james-w/linaro-image-tools/architecture-in-filename into lp:linaro-image-tools/11.11

[James Westby]

Hi,

A small branch to put the architecture name in the hwpack filename, to tell
them apart and stop them colliding when you build multiple architectures.

Thanks,

James

[Michael Hudson-Doyle (mwhudson)]

Very exciting.

 merge approved

Cheers,
mwh

review: Approve

=== modified file 'hwpack/hardwarepack.py'
--- hwpack/hardwarepack.py	2010-09-10 15:54:08 +0000
+++ hwpack/hardwarepack.py	2010-09-10 16:01:43 +0000
@@ -116,8 +116,9 @@
             support_suffix = ""
         else:
             support_suffix = "_%s" % self.metadata.support
-        return "hwpack_%s_%s%s.tar.gz" % (
-            self.metadata.name, self.metadata.version, support_suffix)
+        return "hwpack_%s_%s_%s%s.tar.gz" % (
+            self.metadata.name, self.metadata.version,
+            self.metadata.architecture, support_suffix)
 
     def add_apt_sources(self, sources):
         """Add APT sources to the hardware pack.

=== modified file 'hwpack/tests/test_hardwarepack.py'
--- hwpack/tests/test_hardwarepack.py	2010-09-10 15:54:08 +0000
+++ hwpack/tests/test_hardwarepack.py	2010-09-10 16:01:43 +0000
@@ -145,13 +145,13 @@
 
     def test_filename(self):
         hwpack = HardwarePack(self.metadata)
-        self.assertEqual("hwpack_ahwpack_4.tar.gz", hwpack.filename())
+        self.assertEqual("hwpack_ahwpack_4_armel.tar.gz", hwpack.filename())
 
     def test_filename_with_support(self):
         metadata = Metadata("ahwpack", "4", "armel", support="supported")
         hwpack = HardwarePack(metadata)
         self.assertEqual(
-            "hwpack_ahwpack_4_supported.tar.gz", hwpack.filename())
+            "hwpack_ahwpack_4_armel_supported.tar.gz", hwpack.filename())
 
     def get_tarfile(self, hwpack):
         fileobj = StringIO()