diff options
| author | Amin Hassani <ahassani@chromium.org> | 2019-01-10 14:04:27 -0800 |
|---|---|---|
| committer | Amin Hassani <ahassani@chromium.org> | 2019-01-10 14:13:46 -0800 |
| commit | ef1af2773e238de982d98490d8542668f6499ac5 (patch) | |
| tree | 69ebd93f850546ffb82e09eb96f014e4150736db /scripts/update_payload/applier.py | |
| parent | 2e4eda58d2dd747680cfb519b31072027190370a (diff) | |
update_payload: uprev to minor version 6
BUG=chromium:920699
TEST=unittest
TEST=check_update_payload --check # with a delta payload
Change-Id: I40bc1e535ed241b74c6d889757a8dcf046bac0de
Diffstat (limited to 'scripts/update_payload/applier.py')
| -rw-r--r-- | scripts/update_payload/applier.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/update_payload/applier.py b/scripts/update_payload/applier.py index c63e156c..21d8e875 100644 --- a/scripts/update_payload/applier.py +++ b/scripts/update_payload/applier.py @@ -586,10 +586,7 @@ 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 or - self.minor_version == common.OPSRCHASH_MINOR_PAYLOAD_VERSION or - self.minor_version == common.BROTLI_BSDIFF_MINOR_PAYLOAD_VERSION or - self.minor_version == common.PUFFDIFF_MINOR_PAYLOAD_VERSION): + 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. open(new_part_file_name, 'w').close() @@ -682,4 +679,3 @@ class PayloadApplier(object): self._ApplyToPartition( operations, name, '%s_install_operations' % name, new_parts[name], new_part_info[name], old_parts.get(name, None), old_part_info[name]) - |