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

Fix ota build error when using boot variable files

Browse Source 
When performing a deep copy of info dict, input_file is serialized as
filename. Make ExtractFromInputFile support reading from filename of a
ZipFile.

Test: build OTA with partner provided target_files
Bug: 253549364
Change-Id: I366a076c32d638d61b83a1df9bf864807cf5257c
This commit is contained in:
Kelvin Zhang
2022-10-21 10:53:21 -07:00
parent 5ef25191f7
commit eb147e051e
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/releasetools/common.py
View File

@@ -723,7 +723,16 @@ def ExtractFromInputFile(input_file, fn):
with open(tmp_file, 'wb') as f: with open(tmp_file, 'wb') as f:
f.write(input_file.read(fn)) f.write(input_file.read(fn))
return tmp_file return tmp_file
elif zipfile.is_zipfile(input_file):
with zipfile.ZipFile(input_file, "r", allowZip64=True) as zfp:
tmp_file = MakeTempFile(os.path.basename(fn))
with open(tmp_file, "wb") as fp:
fp.write(zfp.read(fn))
return tmp_file
else: else:
if not os.path.isdir(input_file):
raise ValueError(
"Invalid input_file, accepted inputs are ZipFile object, path to .zip file on disk, or path to extracted directory. Actual: " + input_file)
file = os.path.join(input_file, *fn.split("/")) file = os.path.join(input_file, *fn.split("/"))
if not os.path.exists(file): if not os.path.exists(file):
raise KeyError(fn) raise KeyError(fn)