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