diff options
| author | Michael Hudson <michael.hudson@linaro.org> | 2010-12-10 13:57:06 +1300 |
|---|---|---|
| committer | Michael Hudson <michael.hudson@linaro.org> | 2010-12-10 13:57:06 +1300 |
| commit | e10a9e50c2dd2ea907b6f2e8b568cb0e5ad832d5 (patch) | |
| tree | ec33a85d4563df4d0050c55a0dcd204365e27c26 /hwpack | |
| parent | 8cae55af6be8f6eed720587890e9cd1ee675d595 (diff) | |
rollback format bump & make linaro-hwpack-install detect new-style hwpacks differently
Diffstat (limited to 'hwpack')
| -rw-r--r-- | hwpack/hardwarepack.py | 2 | ||||
| -rw-r--r-- | hwpack/testing.py | 2 | ||||
| -rw-r--r-- | hwpack/tests/test_hardwarepack.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/hwpack/hardwarepack.py b/hwpack/hardwarepack.py index 62d4870..53cbf0c 100644 --- a/hwpack/hardwarepack.py +++ b/hwpack/hardwarepack.py @@ -96,7 +96,7 @@ class HardwarePack(object): """ # The format version cannot contain white spaces. - FORMAT = "2.0" + FORMAT = "1.0" FORMAT_FILENAME = "FORMAT" METADATA_FILENAME = "metadata" MANIFEST_FILENAME = "manifest" diff --git a/hwpack/testing.py b/hwpack/testing.py index 1d74c54..798f823 100644 --- a/hwpack/testing.py +++ b/hwpack/testing.py @@ -337,7 +337,7 @@ class IsHardwarePack(Matcher): tf = tarfile.open(name=path, mode="r:gz") try: matchers = [] - matchers.append(HardwarePackHasFile("FORMAT", content="2.0\n")) + matchers.append(HardwarePackHasFile("FORMAT", content="1.0\n")) matchers.append(HardwarePackHasFile( "metadata", content=str(self.metadata))) manifest_lines = [] diff --git a/hwpack/tests/test_hardwarepack.py b/hwpack/tests/test_hardwarepack.py index e86041e..5b3faed 100644 --- a/hwpack/tests/test_hardwarepack.py +++ b/hwpack/tests/test_hardwarepack.py @@ -111,9 +111,9 @@ class HardwarePackTests(TestCase): super(HardwarePackTests, self).setUp() self.metadata = Metadata("ahwpack", "4", "armel") - def test_format_is_2_0(self): + def test_format_is_1_0(self): hwpack = HardwarePack(self.metadata) - self.assertEqual("2.0", hwpack.FORMAT) + self.assertEqual("1.0", hwpack.FORMAT) def test_format_has_no_spaces(self): hwpack = HardwarePack(self.metadata) |