p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "releasetools: Merge two identical conditional branches."

This commit is contained in:
Treehugger Robot 2017-03-01 17:58:11 +00:00 committed by Gerrit Code Review
parent d579b8eb1f 9beea2a4a3
commit 59978ab6e3
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/releasetools/common.py
View File

@ -1449,14 +1449,7 @@ class BlockDifference(object):
return return
ranges_str = ranges.to_string_raw() ranges_str = ranges.to_string_raw()
if self.version >= 4: if self.version >= 3:
script.AppendExtra(('if (range_sha1("%s", "%s") == "%s" || '
'block_image_verify("%s", '
'package_extract_file("%s.transfer.list"), '
'"%s.new.dat", "%s.patch.dat")) then') % (
self.device, ranges_str, expected_sha1,
self.device, partition, partition, partition))
elif self.version == 3:
script.AppendExtra(('if (range_sha1("%s", "%s") == "%s" || ' script.AppendExtra(('if (range_sha1("%s", "%s") == "%s" || '
'block_image_verify("%s", ' 'block_image_verify("%s", '
'package_extract_file("%s.transfer.list"), ' 'package_extract_file("%s.transfer.list"), '