StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

releasetools: Fix an equality check bug when asserting stash size.

Browse Source 
Otherwise the comparison is inconsistent between ReviseStashSize() and
WriteTransfers().

Bug: 35775675
Test: Successfully generate a previously failed incremental.
Change-Id: I554a51a210bf322cb5c79e28cf85607a417b094a
This commit is contained in:
Tao Bao
2017-02-26 10:48:11 -08:00
parent 56a2d9ff56
commit e8c68a03c8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/releasetools/blockimgdiff.py
View File

@@ -567,7 +567,7 @@ class BlockImageDiff(object):
cache_size = common.OPTIONS.cache_size cache_size = common.OPTIONS.cache_size
stash_threshold = common.OPTIONS.stash_threshold stash_threshold = common.OPTIONS.stash_threshold
max_allowed = cache_size * 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)' % ( 'Stash size %d (%d * %d) exceeds the limit %d (%d * %.2f)' % (
max_stashed_blocks * self.tgt.blocksize, max_stashed_blocks, max_stashed_blocks * self.tgt.blocksize, max_stashed_blocks,
self.tgt.blocksize, max_allowed, cache_size, self.tgt.blocksize, max_allowed, cache_size,