commit | 6fcd2b432564ee425a45140ac1da8ed0e407ad0c | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Sep 15 02:29:49 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 15 02:29:49 2022 +0000 |
tree | dcfede175837692d149bb747e8de3bc1dc57904a | |
parent | a21737a58ff72844aa8d42c81f4028e8b5829b55 [diff] | |
parent | e98964339e1a2f9f93e4f1fe03e69abee25fefbf [diff] |
Merge "Fix incorrect input for path and entry" am: e98964339e Original change: https://android-review.googlesource.com/c/platform/build/+/2215166 Change-Id: I6297abfe1e46c071a6e54660bc43a6a91c5d66d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tools/releasetools/ota_utils.py b/tools/releasetools/ota_utils.py index e1529c7..06349a2 100644 --- a/tools/releasetools/ota_utils.py +++ b/tools/releasetools/ota_utils.py
@@ -713,7 +713,7 @@ if entry in zfp.namelist(): return zfp.read(entry).decode() else: - entry_path = os.path.join(entry, path) + entry_path = os.path.join(path, entry) if os.path.exists(entry_path): with open(entry_path, "r") as fp: return fp.read()