mirror of
https://github.com/smaeul/u-boot.git
synced 2025-11-18 01:40:58 +00:00
u_boot_pylib: Ensure subprocess is closed down
It isn't clear why we need to have two different paths for closing down the pipe. Unify them and use the Python to avoid this warning: subprocess.py:1127: ResourceWarning: subprocess 83531 is still running Note that this code appears to originally have come from [1] and was committed into the ChromeOS chromiumos/platform/crosutils repo in the bin/cros_image_to_target.py file. The addition of the extra code path came later, so that is chosen for the fixes tag. [1] https://codereview.chromium.org/3391008 Signed-off-by: Simon Glass <sjg@chromium.org> Fixes: a10fd93cbc patman: Make command methods return a CommandResult
This commit is contained in:
parent
a44cb1f240
commit
ae94c3d4ee
@ -105,9 +105,7 @@ def run_pipe(pipe_list, infile=None, outfile=None,
|
||||
last_pipe.communicate_filter(output_func))
|
||||
if result.stdout and oneline:
|
||||
result.output = result.stdout.rstrip(b'\r\n')
|
||||
result.return_code = last_pipe.wait()
|
||||
else:
|
||||
result.return_code = os.waitpid(last_pipe.pid, 0)[1]
|
||||
result.return_code = last_pipe.wait()
|
||||
if raise_on_error and result.return_code:
|
||||
raise Exception("Error running '%s'" % user_pipestr)
|
||||
return result.to_output(binary)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user