Merge "Fix print error of numbers of blocks"

am: 2acd8a2eef

* commit '2acd8a2eef88973ce222a4ed90efaa94ede1a30b':
  Fix print error of numbers of blocks
This commit is contained in:
Tianjie Xu 2016-01-15 19:21:00 +00:00 committed by android-build-merger
commit dabcd36224

View file

@ -613,12 +613,15 @@ class BlockImageDiff(object):
def_cmd = stashes[idx][1]
assert (idx, sr) in def_cmd.stash_before
def_cmd.stash_before.remove((idx, sr))
new_blocks += sr.size()
# Add up blocks that violates space limit and print total number to
# screen later.
new_blocks += cmd.tgt_ranges.size()
cmd.ConvertToNew()
print(" Total %d blocks are packed as new blocks due to insufficient "
"cache size." % (new_blocks,))
num_of_bytes = new_blocks * self.tgt.blocksize
print(" Total %d blocks (%d bytes) are packed as new blocks due to "
"insufficient cache size." % (new_blocks, num_of_bytes))
def ComputePatches(self, prefix):
print("Reticulating splines...")