diff options
Diffstat (limited to 'tools/releasetools/blockimgdiff.py')
| -rw-r--r-- | tools/releasetools/blockimgdiff.py | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/tools/releasetools/blockimgdiff.py b/tools/releasetools/blockimgdiff.py index 75379cd..925d38b 100644 --- a/tools/releasetools/blockimgdiff.py +++ b/tools/releasetools/blockimgdiff.py @@ -200,7 +200,7 @@ class Transfer(object): # original image. class BlockImageDiff(object): - def __init__(self, tgt, src=None, threads=None, version=3): + def __init__(self, tgt, src=None, threads=None, version=2): if threads is None: threads = multiprocessing.cpu_count() // 2 if threads == 0: @@ -211,7 +211,7 @@ class BlockImageDiff(object): self.src_basenames = {} self.src_numpatterns = {} - assert version in (1, 2, 3) + assert version in (1, 2) self.tgt = tgt if src is None: @@ -295,15 +295,7 @@ class BlockImageDiff(object): next_stash_id += 1 stashes[s] = sid stashed_blocks += sr.size() - if self.version == 2: - out.append("stash %d %s\n" % (sid, sr.to_string_raw())) - else: - sh = self.HashBlocks(self.src, sr) - if sh in stashes: - stashes[sh] += 1 - else: - stashes[sh] = 1 - out.append("stash %s %s\n" % (sh, sr.to_string_raw())) + out.append("stash %d %s\n" % (sid, sr.to_string_raw())) if stashed_blocks > max_stashed_blocks: max_stashed_blocks = stashed_blocks @@ -329,7 +321,6 @@ class BlockImageDiff(object): sid = stashes.pop(s) stashed_blocks -= sr.size() unstashed_src_ranges = unstashed_src_ranges.subtract(sr) - sh = self.HashBlocks(self.src, sr) sr = xf.src_ranges.map_within(sr) mapped_stashes.append(sr) if self.version == 2: @@ -356,7 +347,7 @@ class BlockImageDiff(object): src_str = " ".join(src_str) - # all versions: + # both versions: # zero <rangeset> # new <rangeset> # erase <rangeset> @@ -430,9 +421,8 @@ class BlockImageDiff(object): else: raise ValueError("unknown transfer style '%s'\n" % xf.style) - if free_string: - out.append("".join(free_string)) - + if free_string: + out.append("".join(free_string)) # sanity check: abort if we're going to need more than 512 MB if # stash space |