commit 16db047f9e7c3b467bc21e582fad33f2f782f205
author Tianjie Xu <xunchang@google.com> Wed Jun 17 00:18:39 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 17 00:18:39 2020 +0000
tree 59f5ea7d8da7b04bfde6d037c1702fd77e93f040
parent f24ee30bc877d2d99bf1f27b19c10edffcf3354a
parent 21c7d8c5c6d59c6bc8d79339df13eab4c56c0e9e

Merge "Fix the read on a closed zipfile" into rvc-dev am: 21c7d8c5c6

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11859314

Change-Id: I4111bdee72e6fd9ac36000f9f217e178ed21b1ae

tools/releasetools/ota_from_target_files.py

diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index b753414..3b68439 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -2012,9 +2012,16 @@
     info_dict = copy.deepcopy(build_info.info_dict)
     for partition in common.PARTITIONS_WITH_CARE_MAP:
       partition_prop_key = "{}.build.prop".format(partition)
-      old_props = info_dict[partition_prop_key]
-      info_dict[partition_prop_key] = common.PartitionBuildProps.FromInputFile(
-          old_props.input_file, partition, placeholder_values)
+      input_file = info_dict[partition_prop_key].input_file
+      if isinstance(input_file, zipfile.ZipFile):
+        with zipfile.ZipFile(input_file.filename) as input_zip:
+          info_dict[partition_prop_key] = \
+              common.PartitionBuildProps.FromInputFile(input_zip, partition,
+                                                       placeholder_values)
+      else:
+        info_dict[partition_prop_key] = \
+            common.PartitionBuildProps.FromInputFile(input_file, partition,
+                                                     placeholder_values)
     info_dict["build.prop"] = info_dict["system.build.prop"]
 
     new_build_info = common.BuildInfo(info_dict, build_info.oem_dicts)