commit 511a7c12bcf28eda77cbe82cc09cddcfd6b15be9
author Alex Klein <saklein@chromium.org> Fri Aug 11 15:28:46 2023 -0600
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Aug 14 21:10:06 2023 +0000
tree 4bc46401c1e8f612b05cff6e263e59e8f40a5f53
parent 9c9430e835ce46cf119131fe904dcffb01ddf722

scripts: pushimage: avoid reparsing recovery instructions

image_type is re-assigned to RECOVERY when None, so will never be
None here, and the RECOVERY instructions are explicitly parsed before
parsing the image_type's instructions, so skip the image_type
instructions when it's RECOVERY.

BUG=None
TEST=CQ

Change-Id: Iecdd88f804d069649b735dc559cd32c96dc72599
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4774773
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Alex Klein <saklein@chromium.org>
Tested-by: Alex Klein <saklein@chromium.org>

scripts/pushimage.py

diff --git a/scripts/pushimage.py b/scripts/pushimage.py
index 382ea30..71028a5 100644
--- a/scripts/pushimage.py
+++ b/scripts/pushimage.py
@@ -98,7 +98,7 @@
         with open(input_insns, encoding="utf-8") as fp:
             config.read_file(fp)
 
-        if image_type is not None:
+        if image_type != constants.IMAGE_TYPE_RECOVERY:
             input_insns = self.GetInsnFile(image_type)
             if not os.path.exists(input_insns):
                 # This type doesn't have any signing instructions.