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

Merge "Fix 'expected str instance, bytes found' error when compute patches"

Browse Source
This commit is contained in:
Treehugger Robot
2022-11-14 19:14:22 +00:00
committed by Gerrit Code Review
parent f0c6cf501c 3e3456bb72
commit 5cf8eef25e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/releasetools/blockimgdiff.py
View File

@@ -1171,7 +1171,7 @@ class BlockImageDiff(object):
try: try:
# Compresses with the default level # Compresses with the default level
compress_obj = zlib.compressobj(6, zlib.DEFLATED, -zlib.MAX_WBITS) compress_obj = zlib.compressobj(6, zlib.DEFLATED, -zlib.MAX_WBITS)
compressed_data = (compress_obj.compress("".join(tgt_data)) compressed_data = (compress_obj.compress(b"".join(tgt_data))
+ compress_obj.flush()) + compress_obj.flush())
compressed_size = len(compressed_data) compressed_size = len(compressed_data)
except zlib.error as e: except zlib.error as e: