diff options
| author | Amin Hassani <ahassani@chromium.org> | 2017-12-15 17:45:49 +0000 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-12-15 22:19:46 -0800 |
| commit | b44f73baa8d302a077ab1c0c73eac63bd02350e5 (patch) | |
| tree | 35b86db22317dd8be45863ee69b722666bb949a2 /scripts/update_payload/applier.py | |
| parent | 717c324c334cc3bac954101f7a127fe8ef56e4e6 (diff) | |
Revert "update_payload: Add XZ compression support"
This reverts commit f1d6ceaedbcf81044d6af6b716c63ed79996f0a4.
Reason for revert: <canaries failing>
Original change's description:
> update_payload: Add XZ compression support
>
> This patch adds support for checking a payload that has REPLACE_XZ
> operations. REPLACE_XZ was added in minor version 3.
>
> BUG=chromium:758792
> TEST=unittests pass; paycheck.py with a xz generated payload pass;
> CQ-DEPEND=CL:823234
>
> Change-Id: If82c767a201b189e464f459d5c19485e5278d9b1
> Reviewed-on: https://chromium-review.googlesource.com/823227
> Commit-Ready: Amin Hassani <ahassani@chromium.org>
> Tested-by: Amin Hassani <ahassani@chromium.org>
> Reviewed-by: Ben Chan <benchan@chromium.org>
> Reviewed-by: Sen Jiang <senj@chromium.org>
TBR=benchan@chromium.org,senj@chromium.org,ahassani@chromium.org
Change-Id: I931ff3be081a41fe5fceef0e049ba4165c6acb49
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:795313
Reviewed-on: https://chromium-review.googlesource.com/830054
Commit-Ready: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Diffstat (limited to 'scripts/update_payload/applier.py')
| -rw-r--r-- | scripts/update_payload/applier.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/scripts/update_payload/applier.py b/scripts/update_payload/applier.py index eeb2e424..3cb9741a 100644 --- a/scripts/update_payload/applier.py +++ b/scripts/update_payload/applier.py @@ -18,10 +18,6 @@ import array import bz2 import hashlib import itertools -try: - import lzma -except ImportError: - from backports import lzma import os import shutil import subprocess @@ -221,7 +217,7 @@ class PayloadApplier(object): self.truncate_to_expected_size = truncate_to_expected_size def _ApplyReplaceOperation(self, op, op_name, out_data, part_file, part_size): - """Applies a REPLACE{,_BZ,_XZ} operation. + """Applies a REPLACE{,_BZ} operation. Args: op: the operation object @@ -240,9 +236,6 @@ class PayloadApplier(object): if op.type == common.OpType.REPLACE_BZ: out_data = bz2.decompress(out_data) data_length = len(out_data) - elif op.type == common.OpType.REPLACE_XZ: - out_data = lzma.decompress(out_data) - data_length = len(out_data) # Write data to blocks specified in dst extents. data_start = 0 @@ -514,8 +507,7 @@ class PayloadApplier(object): # Read data blob. data = self.payload.ReadDataBlob(op.data_offset, op.data_length) - if op.type in (common.OpType.REPLACE, common.OpType.REPLACE_BZ, - common.OpType.REPLACE_XZ): + if op.type in (common.OpType.REPLACE, common.OpType.REPLACE_BZ): self._ApplyReplaceOperation(op, op_name, data, new_part_file, part_size) elif op.type == common.OpType.MOVE: self._ApplyMoveOperation(op, op_name, new_part_file) |