Merge "Fix str/bytes type error in ReplaceOtaKeys" into main
This commit is contained in:
@@ -1131,9 +1131,9 @@ def WriteOtacerts(output_zip, filename, keys):
|
|||||||
common.ZipWriteStr(output_zip, filename, temp_file.getvalue())
|
common.ZipWriteStr(output_zip, filename, temp_file.getvalue())
|
||||||
|
|
||||||
|
|
||||||
def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info):
|
def ReplaceOtaKeys(input_tf_zip: zipfile.ZipFile, output_tf_zip, misc_info):
|
||||||
try:
|
try:
|
||||||
keylist = input_tf_zip.read("META/otakeys.txt").split()
|
keylist = input_tf_zip.read("META/otakeys.txt").decode().split()
|
||||||
except KeyError:
|
except KeyError:
|
||||||
raise common.ExternalError("can't read META/otakeys.txt from input")
|
raise common.ExternalError("can't read META/otakeys.txt from input")
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user