Don't suppress stderr for 'avbtool make_vbmeta_image'
Output is useful for debugging. Bug: 72837107 Test: Local sign_target_files_apks run of locally built target-files Change-Id: I5c27fcc86fa3a51080e0502eb8f5f01a40b033c3
This commit is contained in:
@@ -415,9 +415,10 @@ def AddVBMeta(output_zip, partitions):
|
|||||||
assert found, 'failed to find %s' % (image_path,)
|
assert found, 'failed to find %s' % (image_path,)
|
||||||
cmd.extend(split_args)
|
cmd.extend(split_args)
|
||||||
|
|
||||||
p = common.Run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
p = common.Run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
||||||
p.communicate()
|
stdoutdata, _ = p.communicate()
|
||||||
assert p.returncode == 0, "avbtool make_vbmeta_image failed"
|
assert p.returncode == 0, \
|
||||||
|
"avbtool make_vbmeta_image failed:\n{}".format(stdoutdata)
|
||||||
img.Write()
|
img.Write()
|
||||||
|
|
||||||
|
|
||||||
@@ -444,9 +445,10 @@ def AddPartitionTable(output_zip):
|
|||||||
if args:
|
if args:
|
||||||
cmd.extend(shlex.split(args))
|
cmd.extend(shlex.split(args))
|
||||||
|
|
||||||
p = common.Run(cmd, stdout=subprocess.PIPE)
|
p = common.Run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
||||||
p.communicate()
|
stdoutdata, _ = p.communicate()
|
||||||
assert p.returncode == 0, "bpttool make_table failed"
|
assert p.returncode == 0, \
|
||||||
|
"bpttool make_table failed:\n{}".format(stdoutdata)
|
||||||
|
|
||||||
img.Write()
|
img.Write()
|
||||||
bpt.Write()
|
bpt.Write()
|
||||||
|
Reference in New Issue
Block a user