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/checker.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/checker.py')
| -rw-r--r-- | scripts/update_payload/checker.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/update_payload/checker.py b/scripts/update_payload/checker.py index c10eccef..7abf1785 100644 --- a/scripts/update_payload/checker.py +++ b/scripts/update_payload/checker.py @@ -860,7 +860,7 @@ class PayloadChecker(object): '%s: total src blocks (%d) != total dst blocks (%d).' % (op_name, total_src_blocks, total_dst_blocks)) - def _CheckSourceOperation(self, op, total_src_blocks, op_name): + def _CheckAnySourceOperation(self, op, total_src_blocks, op_name): """Specific checks for SOURCE_* operations. Args: @@ -976,11 +976,11 @@ class PayloadChecker(object): elif op.type == common.OpType.SOURCE_COPY and self.minor_version in (2, 3): self._CheckSourceCopyOperation(data_offset, total_src_blocks, total_dst_blocks, op_name) - self._CheckSourceOperation(op, total_src_blocks, op_name) + self._CheckAnySourceOperation(op, total_src_blocks, op_name) elif (op.type == common.OpType.SOURCE_BSDIFF and self.minor_version in (2, 3)): self._CheckBsdiffOperation(data_length, total_dst_blocks, op_name) - self._CheckSourceOperation(op, total_src_blocks, op_name) + self._CheckAnySourceOperation(op, total_src_blocks, op_name) else: raise error.PayloadError( 'Operation %s (type %d) not allowed in minor version %d' % |