openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Do not use block_verify on target-files where feature is missing."

This commit is contained in:
Dan Albert 2015-03-13 20:31:40 +00:00 committed by Gerrit Code Review
parent 105b94cc44 910b005f18
commit cb9ace32d4
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/releasetools/common.py
View File

@ -1030,14 +1030,14 @@ class BlockDifference:
self.partition = partition
self.check_first_block = check_first_block
version = 1
self.version = 1
if OPTIONS.info_dict:
version = max(
self.version = max(
int(i) for i in
OPTIONS.info_dict.get("blockimgdiff_versions", "1").split(","))
b = blockimgdiff.BlockImageDiff(tgt, src, threads=OPTIONS.worker_threads,
version=version)
version=self.version)
tmpdir = tempfile.mkdtemp()
OPTIONS.tempfiles.append(tmpdir)
self.path = os.path.join(tmpdir, partition)
@ -1060,10 +1060,15 @@ class BlockDifference:
if not self.src:
script.Print("Image %s will be patched unconditionally." % (partition,))
else:
script.AppendExtra(('if block_image_verify("%s", '
'package_extract_file("%s.transfer.list"), '
'"%s.new.dat", "%s.patch.dat") then') %
(self.device, partition, partition, partition))
if self.version >= 3:
script.AppendExtra(('if block_image_verify("%s", '
'package_extract_file("%s.transfer.list"), '
'"%s.new.dat", "%s.patch.dat") then') %
(self.device, partition, partition, partition))
else:
script.AppendExtra('if range_sha1("%s", "%s") == "%s" then' %
(self.device, self.src.care_map.to_string_raw(),
self.src.TotalSha1()))
script.Print("Verified %s image..." % (partition,))
script.AppendExtra('else');