p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "logging: set stdout and stderr to None in some cases"

This commit is contained in:
Tao Bao 2019-07-17 15:40:59 +00:00 committed by Gerrit Code Review
parent cea6dcd135 2f7e11ef27
commit e733ed7e6b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/releasetools/common.py
View File

@ -251,6 +251,8 @@ def RunAndCheckOutput(args, verbose=None, **kwargs):
""" """
proc = Run(args, verbose=verbose, **kwargs) proc = Run(args, verbose=verbose, **kwargs)
output, _ = proc.communicate() output, _ = proc.communicate()
if output is None:
output = ""
# Don't log any if caller explicitly says so. # Don't log any if caller explicitly says so.
if verbose != False: if verbose != False:
logger.info("%s", output.rstrip()) logger.info("%s", output.rstrip())

10
tools/releasetools/ota_from_target_files.py
View File

@ -517,7 +517,7 @@ class PayloadSigner(object):
"""Signs the given input file. Returns the output filename.""" """Signs the given input file. Returns the output filename."""
out_file = common.MakeTempFile(prefix="signed-", suffix=".bin") out_file = common.MakeTempFile(prefix="signed-", suffix=".bin")
cmd = [self.signer] + self.signer_args + ['-in', in_file, '-out', out_file] cmd = [self.signer] + self.signer_args + ['-in', in_file, '-out', out_file]
common.RunAndCheckOutput(cmd) common.RunAndCheckOutput(cmd, stdout=None, stderr=None)
return out_file return out_file
@ -559,7 +559,7 @@ class Payload(object):
if source_file is not None: if source_file is not None:
cmd.extend(["--source_image", source_file]) cmd.extend(["--source_image", source_file])
cmd.extend(additional_args) cmd.extend(additional_args)
common.RunAndCheckOutput(cmd) common.RunAndCheckOutput(cmd, stdout=None, stderr=None)
self.payload_file = payload_file self.payload_file = payload_file
self.payload_properties = None self.payload_properties = None
@ -583,7 +583,7 @@ class Payload(object):
"--signature_size", str(payload_signer.key_size), "--signature_size", str(payload_signer.key_size),
"--metadata_hash_file", metadata_sig_file, "--metadata_hash_file", metadata_sig_file,
"--payload_hash_file", payload_sig_file] "--payload_hash_file", payload_sig_file]
common.RunAndCheckOutput(cmd) common.RunAndCheckOutput(cmd, stdout=None, stderr=None)
# 2. Sign the hashes. # 2. Sign the hashes.
signed_payload_sig_file = payload_signer.Sign(payload_sig_file) signed_payload_sig_file = payload_signer.Sign(payload_sig_file)
@ -598,7 +598,7 @@ class Payload(object):
"--signature_size", str(payload_signer.key_size), "--signature_size", str(payload_signer.key_size),
"--metadata_signature_file", signed_metadata_sig_file, "--metadata_signature_file", signed_metadata_sig_file,
"--payload_signature_file", signed_payload_sig_file] "--payload_signature_file", signed_payload_sig_file]
common.RunAndCheckOutput(cmd) common.RunAndCheckOutput(cmd, stdout=None, stderr=None)
# 4. Dump the signed payload properties. # 4. Dump the signed payload properties.
properties_file = common.MakeTempFile(prefix="payload-properties-", properties_file = common.MakeTempFile(prefix="payload-properties-",
@ -606,7 +606,7 @@ class Payload(object):
cmd = ["brillo_update_payload", "properties", cmd = ["brillo_update_payload", "properties",
"--payload", signed_payload_file, "--payload", signed_payload_file,
"--properties_file", properties_file] "--properties_file", properties_file]
common.RunAndCheckOutput(cmd) common.RunAndCheckOutput(cmd, stdout=None, stderr=None)
if self.secondary: if self.secondary:
with open(properties_file, "a") as f: with open(properties_file, "a") as f: