releasetools: Add a verbose parameter to common.Run().
Caller can optionally specify the verbose flag which overrides OPTIONS.verbose. The command line won't be outputed with verbose=False. This is useful for cases that a) those command lines are less useful (but will spam the output otherwise); b) sensitive info is part of the invocation. 'verbose=False' will be consumed by common.Run() only, instead of being passed to subprocess.Popen(). Test: ota_from_target_files.py on a block based OTA. Change-Id: I7d5b4094d756a60f84f89c6a965e7ccc68e435f8
This commit is contained in:
@@ -41,10 +41,10 @@ def compute_patch(srcfile, tgtfile, imgdiff=False):
|
||||
cmd = ['imgdiff', '-z'] if imgdiff else ['bsdiff']
|
||||
cmd.extend([srcfile, tgtfile, patchfile])
|
||||
|
||||
# Not using common.Run(), which would otherwise dump all the bsdiff/imgdiff
|
||||
# commands when OPTIONS.verbose is True - not useful for the case here, since
|
||||
# they contain temp filenames only.
|
||||
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
||||
# Don't dump the bsdiff/imgdiff commands, which are not useful for the case
|
||||
# here, since they contain temp filenames only.
|
||||
p = common.Run(cmd, verbose=False, stdout=subprocess.PIPE,
|
||||
stderr=subprocess.STDOUT)
|
||||
output, _ = p.communicate()
|
||||
|
||||
if p.returncode != 0:
|
||||
|
Reference in New Issue
Block a user