StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix incorrect input for path and entry" am: e98964339e am: 6fcd2b4325 am: 31e3ab6af1 am: fe9821c260 am: f3708467b7

Browse Source 
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>
This commit is contained in:
Treehugger Robot
2022-09-15 04:27:25 +00:00
committed by Automerger Merge Worker
parent b0d6f7682b f3708467b7
commit b580a6abeb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/releasetools/ota_utils.py
View File

@@ -713,7 +713,7 @@ def IsZucchiniCompatible(source_file: str, target_file: str):
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()