commit 9def0e5609f6bfe67b44d754a0b7a882bf7be357
author Tao Bao <tbao@google.com> Sun Feb 26 21:39:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun Feb 26 21:39:23 2017 +0000
tree b016c3a00bd45c37ff58480369bcc8a4f88c0987
parent 583235d0481a7e1ddbf988fa3000ec3260478d3c
parent db5463d8ddc4e01bfd4d88bc0c454ffb759a9766

Merge "releasetools: Fix an equality check bug when asserting stash size." am: 2af09af86b
am: db5463d8dd

Change-Id: I198b9be0d250cabb25c0ea9bae11b47f29856873

tools/releasetools/blockimgdiff.py

diff --git a/tools/releasetools/blockimgdiff.py b/tools/releasetools/blockimgdiff.py
index 1edf5b2..c204c90 100644
--- a/tools/releasetools/blockimgdiff.py
+++ b/tools/releasetools/blockimgdiff.py
@@ -567,7 +567,7 @@
         cache_size = common.OPTIONS.cache_size
         stash_threshold = common.OPTIONS.stash_threshold
         max_allowed = cache_size * stash_threshold
-        assert max_stashed_blocks * self.tgt.blocksize < max_allowed, \
+        assert max_stashed_blocks * self.tgt.blocksize <= max_allowed, \
                'Stash size %d (%d * %d) exceeds the limit %d (%d * %.2f)' % (
                    max_stashed_blocks * self.tgt.blocksize, max_stashed_blocks,
                    self.tgt.blocksize, max_allowed, cache_size,