summaryrefslogtreecommitdiff
path: root/scripts/update_payload/payload.py
diff options
context:
space:
mode:
authorGilad Arnold <garnold@chromium.org>2013-05-04 21:40:39 -0700
committerChromeBot <chrome-bot@google.com>2013-05-13 15:54:25 -0700
commit16416600a92a60294cd57aceec170a13ed72ed19 (patch)
tree9c03d70c288b726e10279952311b6f36ab3cf767 /scripts/update_payload/payload.py
parent2ca9f145a8f7abe5893ad43021dc2901072315be (diff)
paycheck: src/dst -> old/new in applier code
The old/new terminology is consistent with that used in update payload manifest, as well as other parts of the update_payload library (e.g. checker). BUG=None TEST=Unit/integration test passes Change-Id: I91244ae8adf073b958e8cd7e7670341f056c848e Reviewed-on: https://gerrit.chromium.org/gerrit/50130 Tested-by: Gilad Arnold <garnold@chromium.org> Reviewed-by: Don Garrett <dgarrett@chromium.org> Commit-Queue: Gilad Arnold <garnold@chromium.org>
Diffstat (limited to 'scripts/update_payload/payload.py')
-rw-r--r--scripts/update_payload/payload.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/update_payload/payload.py b/scripts/update_payload/payload.py
index e4320929..34ebaae7 100644
--- a/scripts/update_payload/payload.py
+++ b/scripts/update_payload/payload.py
@@ -205,15 +205,15 @@ class Payload(object):
kernel_part_size=kernel_part_size,
report_out_file=report_out_file)
- def Apply(self, dst_kernel_part, dst_rootfs_part, src_kernel_part=None,
- src_rootfs_part=None):
+ def Apply(self, new_kernel_part, new_rootfs_part, old_kernel_part=None,
+ old_rootfs_part=None):
"""Applies the update payload.
Args:
- dst_kernel_part: name of dest kernel partition file
- dst_rootfs_part: name of dest rootfs partition file
- src_kernel_part: name of source kernel partition file (optional)
- src_rootfs_part: name of source rootfs partition file (optional)
+ new_kernel_part: name of dest kernel partition file
+ new_rootfs_part: name of dest rootfs partition file
+ old_kernel_part: name of source kernel partition file (optional)
+ old_rootfs_part: name of source rootfs partition file (optional)
Raises:
PayloadError if payload application failed.
@@ -222,9 +222,9 @@ class Payload(object):
# Create a short-lived payload applier object and run it.
helper = applier.PayloadApplier(self)
- helper.Run(dst_kernel_part, dst_rootfs_part,
- src_kernel_part=src_kernel_part,
- src_rootfs_part=src_rootfs_part)
+ helper.Run(new_kernel_part, new_rootfs_part,
+ old_kernel_part=old_kernel_part,
+ old_rootfs_part=old_rootfs_part)
def TraceBlock(self, block, skip, trace_out_file, is_kernel):
"""Traces the origin(s) of a given dest partition block.