Merge branch '2.2' into 3.0

# Conflicts:
#	gns3server/compute/virtualbox/__init__.py
#	gns3server/controller/gns3vm/virtualbox_gns3_vm.py
#	gns3server/crash_report.py
#	gns3server/version.py
#	requirements.txt
This commit is contained in:
grossmj committed 2023-09-23 15:54:54 +10:00
commit d9214a3c67
9 files changed
+112 -41

No files matched your search

+6 -1
View File
@@ -100,9 +100,14 @@ class VirtualBox(BaseManager):
command.extend(args)
command_string = " ".join(command)
log.info(f"Executing VBoxManage with command: {command_string}")
env = os.environ.copy()
env["LANG"] = "en" # force english output because we rely on it to parse the output
try:
process = await asyncio.create_subprocess_exec(
*command, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE
*command,
stdout=asyncio.subprocess.PIPE,
stderr=asyncio.subprocess.PIPE,
env=env
)
except (OSError, subprocess.SubprocessError) as e:
raise VirtualBoxError(f"Could not execute VBoxManage: {e}")