Merge "Remove post-install verification"

This commit is contained in:
Tianjie Xu 2016-04-13 19:19:03 +00:00 committed by Gerrit Code Review
commit dea8b94f98
1 changed files with 4 additions and 2 deletions

View File

@ -1446,7 +1446,8 @@ class BlockDifference(object):
if progress:
script.ShowProgress(progress, 0)
self._WriteUpdate(script, output_zip)
self._WritePostInstallVerifyScript(script)
if OPTIONS.verify:
self._WritePostInstallVerifyScript(script)
def WriteStrictVerifyScript(self, script):
"""Verify all the blocks in the care_map, including clobbered blocks.
@ -1570,7 +1571,8 @@ class BlockDifference(object):
call = ('block_image_update("{device}", '
'package_extract_file("{partition}.transfer.list"), '
'"{partition}.new.dat", "{partition}.patch.dat");\n'.format(
'"{partition}.new.dat", "{partition}.patch.dat") ||\n'
' abort("Failed to update {partition} image.");'.format(
device=self.device, partition=self.partition))
script.AppendExtra(script.WordWrap(call))