StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adding better AVB error message"

Browse Source
This commit is contained in:
Treehugger Robot
2018-09-06 07:45:34 +00:00
committed by Gerrit Code Review
parent 076662d015 99ed1b4fbd
commit 71034e3764
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/releasetools/build_image.py
View File

@@ -197,8 +197,11 @@ def AVBAddFooter(image_path, avbtool, footer_type, partition_size,
cmd.extend(shlex.split(additional_args))
(_, exit_code) = RunCommand(cmd)
return exit_code == 0
output, exit_code = RunCommand(cmd)
if exit_code != 0:
print("Failed to add AVB footer! Error: %s" % output)
return False
return True
def AdjustPartitionSizeForVerity(partition_size, fec_supported):
@@ -587,7 +590,8 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None):
additional_args = prop_dict["avb_add_" + avb_footer_type + "_footer_args"]
max_image_size = AVBCalcMaxImageSize(avbtool, avb_footer_type,
partition_size, additional_args)
if max_image_size == 0:
if max_image_size <= 0:
print("AVBCalcMaxImageSize is <= 0: %d" % max_image_size)
return False
prop_dict["partition_size"] = str(max_image_size)
prop_dict["original_partition_size"] = partition_size