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

4 months ago · d466c85385
parent 35d4391fc0
commit d466c85385
1 changed files with 10 additions and 3 deletions
--- a/gns3server/compute/qemu/init.py
+++ b/gns3server/compute/qemu/init.py
@ -160,13 +160,20 @@ class Qemu(BaseManager):
                            for arch in archs:
                                if f.endswith(arch) or f.endswith("{}.exe".format(arch)) or f.endswith("{}w.exe".format(arch)):
                                    qemu_path = os.path.join(path, f)
-                                    version = await Qemu.get_qemu_version(qemu_path)
+                                    try:
+                                        version = await Qemu.get_qemu_version(qemu_path)
+                                    except QemuError as e:
+                                        log.warning(str(e))
+                                        continue
                                    qemus.append({"path": qemu_path, "version": version})
                        else:
                            qemu_path = os.path.join(path, f)
-                            version = await Qemu.get_qemu_version(qemu_path)
+                            try:
+                                version = await Qemu.get_qemu_version(qemu_path)
+                            except QemuError as e:
+                                log.warning(str(e))
+                                continue
                            qemus.append({"path": qemu_path, "version": version})
-
            except OSError:
                continue