commit 6d2ca1f19ef0aa846a3d21be04a02c48a5aa82ba
author Tao Bao <tbao@google.com> Fri May 18 04:28:21 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 18 04:28:21 2018 +0000
tree 2d682fa21b99d6e86c76e01833ac27772061b487
parent 7e15b44c23ca89920255cc6a1838bb8be0dd7731
parent d32936d6572a525e09c3e02682deff4f7342e586

Merge "releasetools: Skip checking files with non-monotonic ranges."

tools/releasetools/validate_target_files.py

diff --git a/tools/releasetools/validate_target_files.py b/tools/releasetools/validate_target_files.py
index acd5b6e..886de26 100755
--- a/tools/releasetools/validate_target_files.py
+++ b/tools/releasetools/validate_target_files.py
@@ -90,6 +90,12 @@
         logging.warning('Skipping %s that has incomplete block list', entry)
         continue
 
+      # TODO(b/79951650): Handle files with non-monotonic ranges.
+      if not ranges.monotonic:
+        logging.warning(
+            'Skipping %s that has non-monotonic ranges: %s', entry, ranges)
+        continue
+
       blocks_sha1 = image.RangeSha1(ranges)
 
       # The filename under unpacked directory, such as SYSTEM/bin/sh.