Merge lp:~milo/linaro-image-tools/bug1054422 into lp:linaro-image-tools/11.11

[Milo Casagrande]

Changes in this MP fixes problem with bug 1054422. Added also some tests for Samsung specific fields.
There are also two minor fixes found while looking at the code.

[Данило Шеган (danilo)]

Looks good, thanks for the nice fix.

However small the other fixes are, we should generally strive to keep them in separate branches, especially for things where we plan to do a last-minute re-rollout of the tarball: it would be much better to include only relevant changes (it's not going to be obvious what's going on in the commit log if you lump these three changes together, no matter how verbose you make the commit message; it's neither going to be clear why were the other two changes critical and that they needed a .1 release :).

review: Approve

[Milo Casagrande (milo)]

Hi Danilo,

thanks for the review.

On Mon, Sep 24, 2012 at 9:18 PM, Данило Шеган <email address hidden> wrote:
>
> However small the other fixes are, we should generally strive to keep them in separate branches, especially for things where we plan to do a last-minute re-rollout of the tarball: it would be much better to include only relevant changes (it's not going to be obvious what's going on in the commit log if you lump these three changes together, no matter how verbose you make the commit message; it's neither going to be clear why were the other two changes critical and that they needed a .1 release :).

Yeah, I know, I was not sure to include them here.
I can merge only the two commits for the bug fix, and after the
rollout merge the remaining two with the small fixes.

--
Milo Casagrande
Infrastructure Engineer
Linaro.org <www.linaro.org> │ Open source software for ARM SoCs

=== modified file 'linaro_image_tools/hwpack/hardwarepack.py'
--- linaro_image_tools/hwpack/hardwarepack.py	2012-08-29 10:31:19 +0000
+++ linaro_image_tools/hwpack/hardwarepack.py	2012-09-24 12:06:24 +0000
@@ -166,14 +166,14 @@
         self.samsung_bl2_len = samsung_bl2_len
 
     @classmethod
-    def add_v3_config(self, boards=None, bootloaders=None):
+    def add_v3_config(cls, boards=None, bootloaders=None):
         """Add fields that are specific to the v3 config format.
         These fields are not present in the earlier config files.
 
         :param boards: The boards section of the hwpack.
         :param bootloaders: The bootloaders section of the hwpack."""
-        self.boards = boards
-        self.bootloaders = bootloaders
+        cls.boards = boards
+        cls.bootloaders = bootloaders
 
     @classmethod
     def from_config(cls, config, version, architecture):
 
=== modified file 'linaro_image_tools/hwpack/hwpack_fields.py'
--- linaro_image_tools/hwpack/hwpack_fields.py	2012-08-28 06:02:43 +0000
+++ linaro_image_tools/hwpack/hwpack_fields.py	2012-09-24 12:06:24 +0000
@@ -129,7 +129,7 @@
     ROOT_MIN_SIZE_FIELD: None,
     LOADER_MIN_SIZE_FIELD: None,
     SAMSUNG_BL1_LEN_FIELD: None,
-    SAMSUNG_BL1_LEN_FIELD: None,
+    SAMSUNG_BL1_START_FIELD: None,
     SAMSUNG_ENV_LEN_FIELD: None,
     SAMSUNG_BL2_LEN_FIELD: None,
     SNOWBALL_STARTUP_FILES_CONFIG_FIELD: None,
 
=== modified file 'linaro_image_tools/hwpack/tests/test_config_v3.py'
--- linaro_image_tools/hwpack/tests/test_config_v3.py	2012-08-28 17:34:16 +0000
+++ linaro_image_tools/hwpack/tests/test_config_v3.py	2012-09-24 12:06:24 +0000
@@ -26,6 +26,10 @@
 from linaro_image_tools.hwpack.config import Config, HwpackConfigError
 from linaro_image_tools.hwpack.hwpack_fields import (
     DEFINED_PARTITION_LAYOUTS,
+    SAMSUNG_BL1_LEN_FIELD,
+    SAMSUNG_BL1_START_FIELD,
+    SAMSUNG_BL2_LEN_FIELD,
+    SAMSUNG_ENV_LEN_FIELD,
 )
 
 
@@ -796,3 +800,28 @@
         self.assertValidationError("Unknown key in metadata: "
                                    "'boards: snowball: foo'",
                                    config._validate_keys)
+
+    def test_valid_samsung_bl1_len_field(self):
+        config = self.get_config(self.valid_start_v3 +
+                                 SAMSUNG_BL1_LEN_FIELD + ': 1\n')
+        self.assertEqual(None, config._validate_keys())
+
+    def test_valid_samsung_bl1_start_field(self):
+        config = self.get_config(self.valid_start_v3 +
+                                 SAMSUNG_BL1_START_FIELD + ': 1\n')
+        self.assertEqual(None, config._validate_keys())
+
+    def test_valid_samsung_bl2_len_field(self):
+        config = self.get_config(self.valid_start_v3 +
+                                 SAMSUNG_BL2_LEN_FIELD + ': 1\n')
+        self.assertEqual(None, config._validate_keys())
+
+    def test_valid_samsung_env_len_field(self):
+        config = self.get_config(self.valid_start_v3 +
+                                 SAMSUNG_ENV_LEN_FIELD + ': 1\n')
+        self.assertEqual(None, config._validate_keys())
+
+    def test_samsung_field_wrong(self):
+        config = self.get_config(self.valid_start_v3 +
+                                 'samsung_wrong_field: 1\n')
+        self.assertRaises(HwpackConfigError, config._validate_keys)
 
=== modified file 'linaro_image_tools/utils.py'
--- linaro_image_tools/utils.py	2012-07-26 19:49:43 +0000
+++ linaro_image_tools/utils.py	2012-09-24 12:06:24 +0000
@@ -76,13 +76,14 @@
 
 
 def path_in_tarfile_exists(path, tar_file):
-    tarinfo = tarfile.open(tar_file, 'r:gz')
     try:
+        tarinfo = tarfile.open(tar_file, 'r:gz')
         tarinfo.getmember(path)
         return True
     except KeyError:
         return False
-    tarinfo.close()
+    finally:
+        tarinfo.close()
 
 
 def verify_file_integrity(sig_file_list):