jaseg/pogojig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Yield to caller of process_context() before wait() is called on the process.

Browse source
This commit is contained in:
Michael Schwarz 2015-10-02 00:34:02 +02:00
parent ba3bc0513e
commit 0a746f9df2
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
support/lib/util.py
View file

@ -73,7 +73,6 @@ def command_context(args, remove_env = [], set_env = { }, working_dir = None, us
try:
process = subprocess.Popen(args, env = env, cwd = working_dir, stderr = stderr)
process.wait()
except OSError as e:
raise UserError('Error running {}: {}', args[0], e)
@ -88,15 +87,16 @@ def command_context(args, remove_env = [], set_env = { }, working_dir = None, us
raise
finally:
process.wait()
# Use communicate so that we won't deadlock if the process generates some unread output.
process.communicate()
if process.returncode:
raise UserError('Command failed: {}', ' '.join(args))
def command(args, remove_env = [], set_env = { }, working_dir = None):
with command_context(args, remove_env, set_env, working_dir) as process:
process.wait()
with command_context(args, remove_env, set_env, working_dir):
pass
def bash_escape_string(string):