diff options
| author | Sen Jiang <senj@chromium.org> | 2015-12-11 10:27:04 -0800 |
|---|---|---|
| committer | Aseda Aboagye <aaboagye@chromium.org> | 2015-12-12 00:54:34 +0000 |
| commit | d6122bb9df5b593a3ab1fc35fab7f1a0caa53928 (patch) | |
| tree | 48ca2c6041d2b9d8dbd373c8986e4615c6854c01 /scripts/update_payload/applier.py | |
| parent | 912c4df6c4f470ddb6937b40cbe281229548783d (diff) | |
paycheck: Allow minor version 3 in applier.
Also fixed nits in checker.
BUG=chromium:568473
TEST=./checker_unittest.py
Change-Id: Ia791f4dc636e9c3a2921aeaa5f9dd01c247bf5bb
Reviewed-on: https://chromium-review.googlesource.com/317780
Trybot-Ready: Sen Jiang <senj@chromium.org>
Tested-by: Sen Jiang <senj@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: Sen Jiang <senj@chromium.org>
Diffstat (limited to 'scripts/update_payload/applier.py')
| -rw-r--r-- | scripts/update_payload/applier.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/update_payload/applier.py b/scripts/update_payload/applier.py index 5e951560..04791c12 100644 --- a/scripts/update_payload/applier.py +++ b/scripts/update_payload/applier.py @@ -497,9 +497,10 @@ class PayloadApplier(object): if self.minor_version == common.INPLACE_MINOR_PAYLOAD_VERSION: # Copy the src partition to the dst one; make sure we don't truncate it. shutil.copyfile(old_part_file_name, new_part_file_name) - elif self.minor_version == common.SOURCE_MINOR_PAYLOAD_VERSION: - # In minor version 2, we don't want to copy the partitions, so instead - # just make the new partition file. + elif (self.minor_version == common.SOURCE_MINOR_PAYLOAD_VERSION or + self.minor_version == common.OPSRCHASH_MINOR_PAYLOAD_VERSION): + # In minor version >= 2, we don't want to copy the partitions, so + # instead just make the new partition file. open(new_part_file_name, 'w').close() else: raise PayloadError("Unknown minor version: %d" % self.minor_version) |