commit b220d669d465377e2bb55a37a7028c72d93dcef3
author Tudor Brindus <tbrindus@chromium.org> Tue Jul 10 23:55:51 2018 -0700
committer chrome-bot <chrome-bot@chromium.org> Wed Jul 11 18:48:45 2018 -0700
tree 694cb5ca136a0d6908fc72d9c6faa24595a84494
parent 50a74d68e8667b3b1ffc21756e0371306426cd8c

update_payload: Make paycheck take "root" instead of "rootfs"

This commit makes paycheck take "root" as the rootfs partition label
instead of "rootfs", which makes it consistent with other tooling like
delta_generator.

BUG=chromium:794404
TEST=test_paycheck.sh and run_unittests

Change-Id: I20835e93adbcde459bc86d832e695b38bca55e38
Reviewed-on: https://chromium-review.googlesource.com/1132843
Commit-Ready: Tudor Brindus <tbrindus@chromium.org>
Tested-by: Tudor Brindus <tbrindus@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>

scripts/update_payload/applier.py

diff --git a/scripts/update_payload/applier.py b/scripts/update_payload/applier.py
index 49db8ae..c63e156 100644
--- a/scripts/update_payload/applier.py
+++ b/scripts/update_payload/applier.py
@@ -643,13 +643,13 @@
 
     manifest = self.payload.manifest
     if self.payload.header.version == 1:
-      for name in common.CROS_PARTITIONS:
-        new_part_info[name] = getattr(manifest, 'new_%s_info' % name)
-        old_part_info[name] = getattr(manifest, 'old_%s_info' % name)
+      for real_name, proto_name in common.CROS_PARTITIONS:
+        new_part_info[real_name] = getattr(manifest, 'new_%s_info' % proto_name)
+        old_part_info[real_name] = getattr(manifest, 'old_%s_info' % proto_name)
 
-        install_operations.append((common.ROOTFS, manifest.install_operations))
-        install_operations.append((common.KERNEL,
-                                   manifest.kernel_install_operations))
+      install_operations.append((common.ROOTFS, manifest.install_operations))
+      install_operations.append((common.KERNEL,
+                                 manifest.kernel_install_operations))
     else:
       for part in manifest.partitions:
         name = part.partition_name