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

Change search paths for Qemu on Windows.

Browse Source
This commit is contained in:
Jeremy 2014-12-02 14:49:39 -07:00
parent fed02ee167
commit 1e01c85be9
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gns3server/modules/qemu/__init__.py
View File

@ -625,8 +625,13 @@ class Qemu(IModule):
# look for Qemu binaries in the current working directory and $PATH # look for Qemu binaries in the current working directory and $PATH
if sys.platform.startswith("win"): if sys.platform.startswith("win"):
# add specific Windows paths # add specific Windows paths
paths.append(os.path.join(os.getcwd(), "qemu")) if hasattr(sys, "frozen"):
paths.append(os.path.join(os.getcwd(), "qemu-0.11.0")) # add any qemu dir in the same location as gns3server.exe to the list of paths
exec_dir = os.path.dirname(os.path.abspath(sys.executable))
for f in os.listdir(exec_dir):
if f.lower().startswith("qemu"):
paths.append(os.path.join(exec_dir, f))
if "PROGRAMFILES(X86)" in os.environ and os.path.exists(os.environ["PROGRAMFILES(X86)"]): if "PROGRAMFILES(X86)" in os.environ and os.path.exists(os.environ["PROGRAMFILES(X86)"]):
paths.append(os.path.join(os.environ["PROGRAMFILES(X86)"], "qemu")) paths.append(os.path.join(os.environ["PROGRAMFILES(X86)"], "qemu"))
if "PROGRAMFILES" in os.environ and os.path.exists(os.environ["PROGRAMFILES"]): if "PROGRAMFILES" in os.environ and os.path.exists(os.environ["PROGRAMFILES"]):
@ -637,7 +642,9 @@ class Qemu(IModule):
for path in paths: for path in paths:
try: try:
for f in os.listdir(path): for f in os.listdir(path):
if (f.startswith("qemu-system") or f == "qemu" or f == "qemu.exe") and os.access(os.path.join(path, f), os.X_OK): if (f.startswith("qemu-system") or f == "qemu" or f == "qemu.exe") and \
os.access(os.path.join(path, f), os.X_OK) and \
os.path.isfile(os.path.join(path, f)):
qemu_path = os.path.join(path, f) qemu_path = os.path.join(path, f)
version = self._get_qemu_version(qemu_path) version = self._get_qemu_version(qemu_path)
qemus.append({"path": qemu_path, "version": version}) qemus.append({"path": qemu_path, "version": version})