commit 07491322c33d241ebf01586d8e32586bd7efcf95
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 18 21:20:07 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 18 21:20:07 2022 +0000
tree ff55843cc585c4076d7c3b7d69e46a25b17dabb6
parent 3e77f44587a8f07609d516bbbb1afa03e3f59610
parent b6075c581bbf31acceb85f9efd01c4486b859997

Merge "ota_utils: Don't fail if metadata proto doesn't exist"

tools/releasetools/ota_utils.py

diff --git a/tools/releasetools/ota_utils.py b/tools/releasetools/ota_utils.py
index 6896f83..5d403dc 100644
--- a/tools/releasetools/ota_utils.py
+++ b/tools/releasetools/ota_utils.py
@@ -569,7 +569,8 @@
       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)