| commit | f3708467b76b336c515a97281abb747e97b3af1c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Sep 15 03:55:15 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 15 03:55:15 2022 +0000 |
| tree | 07620161d8f844e36656ed879a6828f454cb35e6 | |
| parent | bdae2b8e69cc9b9cca5544895faca18fae40a1c4 [diff] | |
| parent | fe9821c26008dccb318cba45f782d6f2a24347f8 [diff] |
Merge "Fix incorrect input for path and entry" am: e98964339e am: 6fcd2b4325 am: 31e3ab6af1 am: fe9821c260 Original change: https://android-review.googlesource.com/c/platform/build/+/2215166 Change-Id: I96092a8d587eb515c5330d17cd00ecd13bf3d897 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()