mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-03 14:01:15 +02:00
Merge branch '2.2' into 3.0
# Conflicts: # README.md # gns3server/compute/base_node.py # gns3server/compute/dynamips/__init__.py # gns3server/compute/dynamips/hypervisor.py # gns3server/compute/qemu/__init__.py # gns3server/compute/qemu/qemu_vm.py # gns3server/controller/__init__.py # gns3server/crash_report.py # gns3server/handlers/api/controller/node_handler.py # gns3server/schemas/qemu_template.py # gns3server/static/web-ui/index.html # gns3server/static/web-ui/main.11410ae4eaf4d4c08cd0.js # gns3server/version.py # requirements.txt
This commit is contained in:
commit
267c4cbbbb
175 files changed
+702
-287
No files matched your search
@@ -72,7 +72,7 @@ async def subprocess_check_output(*args, cwd=None, env=None, stderr=False):
|
||||
proc = await asyncio.create_subprocess_exec(*args, stderr=asyncio.subprocess.PIPE, cwd=cwd, env=env)
|
||||
output = await proc.stderr.read()
|
||||
else:
|
||||
proc = await asyncio.create_subprocess_exec(*args, stdout=asyncio.subprocess.PIPE, cwd=cwd, env=env)
|
||||
proc = await asyncio.create_subprocess_exec(*args, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.DEVNULL, cwd=cwd, env=env)
|
||||
output = await proc.stdout.read()
|
||||
if output is None:
|
||||
return ""
|
||||
|
||||
Reference in new issue
Block a user