Merge "releasetools: Capture stderr output when calling delta_generator." am: 26fc64da06

am: 1f49ccfd61

Change-Id: I689d61b9ee186f01be4dd57a5cd1dbbdd530ea9b
This commit is contained in:
Tao Bao
2018-02-06 17:31:02 +00:00
committed by android-build-merger

View File

@@ -165,7 +165,7 @@ def VerifyAbOtaPayload(cert, package):
cmd = ['delta_generator', cmd = ['delta_generator',
'--in_file=' + payload_file, '--in_file=' + payload_file,
'--public_key=' + pubkey] '--public_key=' + pubkey]
proc = common.Run(cmd, stdout=subprocess.PIPE) proc = common.Run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
stdoutdata, _ = proc.communicate() stdoutdata, _ = proc.communicate()
assert proc.returncode == 0, \ assert proc.returncode == 0, \
'Failed to verify payload with delta_generator: %s\n%s' % (package, 'Failed to verify payload with delta_generator: %s\n%s' % (package,