commit 5ebe29607ce3df3956167e2a88c3e9d006a5cef5
author Kelvin Zhang <zhangkelvin@google.com> Fri Sep 24 14:13:28 2021 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 28 21:37:31 2021 +0000
tree c28779e4de9cae7f5f72a96d76277dd99bea7a37
parent e36e4a3ef6f0a830cba7240b294f77985a26b39d

Make simulate_ota support images in RADIO/ dir

Test: th
Change-Id: I067c3c0294558eb9cbea8e3d6030da246c5b1f5e

scripts/simulate_ota.py

diff --git a/scripts/simulate_ota.py b/scripts/simulate_ota.py
index e508f50..40f463f 100644
--- a/scripts/simulate_ota.py
+++ b/scripts/simulate_ota.py
@@ -49,9 +49,13 @@
     return fp.read(4) == b'\x3A\xFF\x26\xED'
 
 
-def extract_img(zip_archive, img_name, output_path):
+def extract_img(zip_archive: zipfile.ZipFile, img_name, output_path):
   entry_name = "IMAGES/" + img_name + ".img"
-  extract_file(zip_archive, entry_name, output_path)
+  try:
+    extract_file(zip_archive, entry_name, output_path)
+  except (KeyError, FileNotFoundError) as e:
+    print("Faild to extract", img_name, "from IMAGES/ dir, trying RADIO/", e)
+    extract_file(zip_archive, "RADIO/" + img_name + ".img", output_path)
   if is_sparse_image(output_path):
     raw_img_path = output_path + ".raw"
     subprocess.check_output(["simg2img", output_path, raw_img_path])
@@ -99,7 +103,7 @@
   partition_names = [
       part.partition_name for part in payload.manifest.partitions
   ]
-  if (payload.manifest.partial_update):
+  if payload.manifest.partial_update:
     delta_generator_args.append("--is_partial_update")
   if payload.is_incremental:
     delta_generator_args.append("--old_partitions=" + ":".join(old_partitions))