arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 03:08:14 +00:00
Code Issues Releases Wiki Activity

Do not stop searching for Qemu binaries if one binary cannot be executed. Ref #2306

Browse Source
This commit is contained in:
grossmj 2024-01-11 23:11:56 +11:00
parent 13d9afd8bc
commit 473fa98eda
No known key found for this signature in database
GPG Key ID: 0A2D76AC45EA25CD
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gns3server/compute/qemu/__init__.py
View File

@ -160,13 +160,20 @@ class Qemu(BaseManager):
for arch in archs: for arch in archs:
if f.endswith(arch) or f.endswith("{}.exe".format(arch)) or f.endswith("{}w.exe".format(arch)): if f.endswith(arch) or f.endswith("{}.exe".format(arch)) or f.endswith("{}w.exe".format(arch)):
qemu_path = os.path.join(path, f) qemu_path = os.path.join(path, f)
try:
version = await Qemu.get_qemu_version(qemu_path) version = await Qemu.get_qemu_version(qemu_path)
except QemuError as e:
log.warning(str(e))
continue
qemus.append({"path": qemu_path, "version": version}) qemus.append({"path": qemu_path, "version": version})
else: else:
qemu_path = os.path.join(path, f) qemu_path = os.path.join(path, f)
try:
version = await Qemu.get_qemu_version(qemu_path) version = await Qemu.get_qemu_version(qemu_path)
except QemuError as e:
log.warning(str(e))
continue
qemus.append({"path": qemu_path, "version": version}) qemus.append({"path": qemu_path, "version": version})
except OSError: except OSError:
continue continue