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

Update paths for binaries moved to the MacOS directory in GNS3.app

Browse Source
This commit is contained in:
grossmj 2019-03-04 16:07:04 +07:00
parent 69ba0ccf77
commit 4c83fc1243
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,10 +100,10 @@ class Qemu(BaseManager):
paths.update(["/usr/bin", "/usr/local/bin", "/opt/local/bin"]) paths.update(["/usr/bin", "/usr/local/bin", "/opt/local/bin"])
try: try:
exec_dir = os.path.dirname(os.path.abspath(sys.executable)) exec_dir = os.path.dirname(os.path.abspath(sys.executable))
paths.add(os.path.abspath(os.path.join(exec_dir, "../Resources/qemu/bin/"))) paths.add(os.path.abspath(os.path.join(exec_dir, "qemu/bin")))
# If the user run the server by hand from outside # If the user run the server by hand from outside
except FileNotFoundError: except FileNotFoundError:
paths.add("/Applications/GNS3.app/Contents/Resources/qemu/bin") paths.add("/Applications/GNS3.app/Contents/MacOS/qemu/bin")
return paths return paths
@staticmethod @staticmethod

2
gns3server/version.py
View File

@ -23,7 +23,7 @@
# or negative for a release candidate or beta (after the base version # or negative for a release candidate or beta (after the base version
# number has been incremented) # number has been incremented)
__version__ = "2.2.0dev2" __version__ = "2.2.0dev6"
__version_info__ = (2, 2, 0, 99) __version_info__ = (2, 2, 0, 99)
# If it's a git checkout try to add the commit # If it's a git checkout try to add the commit