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