diff options
Diffstat (limited to 'scripts/update_payload/payload.py')
| -rw-r--r-- | scripts/update_payload/payload.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/scripts/update_payload/payload.py b/scripts/update_payload/payload.py index 184f8057..8d9a20eb 100644 --- a/scripts/update_payload/payload.py +++ b/scripts/update_payload/payload.py @@ -13,8 +13,8 @@ from update_payload import applier from update_payload import block_tracer from update_payload import checker from update_payload import common -from update_payload.error import PayloadError from update_payload import update_metadata_pb2 +from update_payload.error import PayloadError # @@ -193,8 +193,6 @@ class Payload(object): if self.is_init: raise PayloadError('payload object already initialized') - # Initialize hash context. - # pylint: disable=E1101 self.manifest_hasher = hashlib.sha256() # Read the file header. @@ -237,11 +235,9 @@ class Payload(object): _DisplayIndentedValue('Build version', image_info.build_version) if self.manifest.HasField('old_image_info'): - # pylint: disable=E1101 _DescribeImageInfo('Old Image', self.manifest.old_image_info) if self.manifest.HasField('new_image_info'): - # pylint: disable=E1101 _DescribeImageInfo('New Image', self.manifest.new_image_info) def _AssertInit(self): @@ -299,7 +295,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: @@ -309,6 +305,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) @@ -321,6 +318,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, |