mirror of
https://github.com/GNS3/gns3-server
synced 2024-11-28 11:18:11 +00:00
Fix crash in VPCS
This commit is contained in:
parent
0977af1c00
commit
3cb7213427
@ -38,17 +38,17 @@ def wait_run_in_executor(func, *args):
|
|||||||
|
|
||||||
|
|
||||||
@asyncio.coroutine
|
@asyncio.coroutine
|
||||||
def subprocess_check_output(*args, working_dir=None, env=None):
|
def subprocess_check_output(*args, cwd=None, env=None):
|
||||||
"""
|
"""
|
||||||
Run a command and capture output
|
Run a command and capture output
|
||||||
|
|
||||||
:param *args: List of command arguments
|
:param *args: List of command arguments
|
||||||
:param working_dir: Working directory
|
:param cwd: Current working directory
|
||||||
:param env: Command environment
|
:param env: Command environment
|
||||||
:returns: Command output
|
:returns: Command output
|
||||||
"""
|
"""
|
||||||
|
|
||||||
proc = yield from asyncio.create_subprocess_exec(*args, stdout=asyncio.subprocess.PIPE, cwd=working_dir, env=env)
|
proc = yield from asyncio.create_subprocess_exec(*args, stdout=asyncio.subprocess.PIPE, cwd=cwd, env=env)
|
||||||
output = yield from proc.stdout.read()
|
output = yield from proc.stdout.read()
|
||||||
if output is None:
|
if output is None:
|
||||||
return ""
|
return ""
|
||||||
|
Loading…
Reference in New Issue
Block a user