Merge "ota_utils: Don't fail if metadata proto doesn't exist" am: 07491322c3 am: 412eb36668

Original change: https://android-review.googlesource.com/c/platform/build/+/1879917

Change-Id: Id6f0f4a08c1f5be05b387c5803ef3d37c6313fb4
This commit is contained in:
Treehugger Robot 2022-02-18 21:48:58 +00:00 committed by Automerger Merge Worker
commit 0f24066987

View file

@ -569,7 +569,8 @@ class PropertyFiles(object):
tokens.append('metadata.pb:' + ' ' * 15)
else:
tokens.append(ComputeEntryOffsetSize(METADATA_NAME))
tokens.append(ComputeEntryOffsetSize(METADATA_PROTO_NAME))
if METADATA_PROTO_NAME in zip_file.namelist():
tokens.append(ComputeEntryOffsetSize(METADATA_PROTO_NAME))
return ','.join(tokens)