Merge "releasetools: Fix the bug in AssertSequenceGood."

2016-03-07 22:25:02 +00:00 · 2016-03-07 22:25:02 +00:00 · 236e664efa
parent 74d4d98be1 dca2200c8a
commit 236e664efa
1 changed files with 4 additions and 1 deletions
--- a/tools/releasetools/blockimgdiff.py
+++ b/tools/releasetools/blockimgdiff.py
@ -771,7 +771,10 @@ class BlockImageDiff(object):
          x = x.subtract(sr)

      for s, e in x:
-        for i in range(s, e):
+        # Source image could be larger. Don't check the blocks that are in the
+        # source image only. Since they are not in 'touched', and won't ever
+        # be touched.
+        for i in range(s, min(e, self.tgt.total_blocks)):
          assert touched[i] == 0

      # Check that the output blocks for this transfer haven't yet