summaryrefslogtreecommitdiff
path: root/scripts/update_payload/payload.py
diff options
context:
space:
mode:
authorAmin Hassani <ahassani@google.com>2017-12-01 10:46:45 -0800
committerchrome-bot <chrome-bot@chromium.org>2017-12-01 20:32:30 -0800
commit6be716878b4027e6c2617bb7c3ce2c877331d1d2 (patch)
tree54424828536dd8d3082e9a065a7d472e37e9047f /scripts/update_payload/payload.py
parent7bc9c02869b90a5876bd74a97693a866f1c5ea5e (diff)
update_payload: Add puffin binary path to paycheck.py
We forgot to add the path to the puffin binary to paycheck.py and payload.py and this caused the canary builds fail for minor version 4. This patch fixes it. BUG=chromium:791079 TEST=tryjob Change-Id: I194ab9d9d0b93fc9d456b994f73424d7dedbf181 Reviewed-on: https://chromium-review.googlesource.com/803656 Commit-Ready: Amin Hassani <ahassani@chromium.org> Tested-by: Amin Hassani <ahassani@chromium.org> Reviewed-by: Andrew de los Reyes <adlr@chromium.org>
Diffstat (limited to 'scripts/update_payload/payload.py')
-rw-r--r--scripts/update_payload/payload.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/update_payload/payload.py b/scripts/update_payload/payload.py
index f76c0de6..d8305a17 100644
--- a/scripts/update_payload/payload.py
+++ b/scripts/update_payload/payload.py
@@ -293,7 +293,7 @@ class Payload(object):
def Apply(self, new_kernel_part, new_rootfs_part, old_kernel_part=None,
old_rootfs_part=None, bsdiff_in_place=True, bspatch_path=None,
- truncate_to_expected_size=True):
+ puffpatch_path=None, truncate_to_expected_size=True):
"""Applies the update payload.
Args:
@@ -303,6 +303,7 @@ class Payload(object):
old_rootfs_part: name of source rootfs partition file (optional)
bsdiff_in_place: whether to perform BSDIFF operations in-place (optional)
bspatch_path: path to the bspatch binary (optional)
+ puffpatch_path: path to the puffpatch binary (optional)
truncate_to_expected_size: whether to truncate the resulting partitions
to their expected sizes, as specified in the
payload (optional)
@@ -315,6 +316,7 @@ class Payload(object):
# Create a short-lived payload applier object and run it.
helper = applier.PayloadApplier(
self, bsdiff_in_place=bsdiff_in_place, bspatch_path=bspatch_path,
+ puffpatch_path=puffpatch_path,
truncate_to_expected_size=truncate_to_expected_size)
helper.Run(new_kernel_part, new_rootfs_part,
old_kernel_part=old_kernel_part,