diff options
| author | Amin Hassani <ahassani@google.com> | 2018-02-07 16:21:33 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-02-08 23:41:46 -0800 |
| commit | 77d7cbcef1ca1afd36720ec7ec74039b5445101e (patch) | |
| tree | 6305cce22e391284bc5b06bce00928ba7fb8d69d /scripts/update_payload/checker.py | |
| parent | 15de2fd0ff2d19a7ef36a0f28bb5df028163605c (diff) | |
update_engine: Disable puffin in minor version 4
This patch disables puffin for minor version 4, but keeps BROTLI_BSDIFF in the
same minor version. Also adds puffin for minor version 5, but it does not
enable it.
BUG=b:72815313
BUG=chromium:810184
TEST=update_engine unittests pass
TEST=update_payload unittests pass
TEST=test_paycheck.sh on two images with minor version 4 pass
TEST=brill_update_payload generate/verify pass
Change-Id: I814fc126d67207501d419cff9c575cd13d877b48
Reviewed-on: https://chromium-review.googlesource.com/907223
Commit-Ready: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
Diffstat (limited to 'scripts/update_payload/checker.py')
| -rw-r--r-- | scripts/update_payload/checker.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/update_payload/checker.py b/scripts/update_payload/checker.py index db170119..e241b0b0 100644 --- a/scripts/update_payload/checker.py +++ b/scripts/update_payload/checker.py @@ -69,6 +69,7 @@ _SUPPORTED_MINOR_VERSIONS = { 2: (_TYPE_DELTA,), 3: (_TYPE_DELTA,), 4: (_TYPE_DELTA,), + 5: (_TYPE_DELTA,), } _OLD_DELTA_USABLE_PART_SIZE = 2 * 1024 * 1024 * 1024 @@ -1029,8 +1030,10 @@ class PayloadChecker(object): elif op.type == common.OpType.SOURCE_BSDIFF and self.minor_version >= 2: self._CheckAnyDiffOperation(op, data_length, total_dst_blocks, op_name) self._CheckAnySourceOperation(op, total_src_blocks, op_name) - elif (op.type in (common.OpType.PUFFDIFF, common.OpType.BROTLI_BSDIFF) and - self.minor_version >= 4): + elif op.type == common.OpType.BROTLI_BSDIFF and self.minor_version >= 4: + self._CheckAnyDiffOperation(op, data_length, total_dst_blocks, op_name) + self._CheckAnySourceOperation(op, total_src_blocks, op_name) + elif op.type == common.OpType.PUFFDIFF and self.minor_version >= 5: self._CheckAnyDiffOperation(op, data_length, total_dst_blocks, op_name) self._CheckAnySourceOperation(op, total_src_blocks, op_name) else: |