NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-18 23:43:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Julien Duponchelle 2015-06-03 18:58:17 +02:00
parent a1204dca0a
commit d8fb33dba2
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,12 +46,8 @@ class Qemu(BaseManager):
:returns: List of folders where Qemu binaries MAY reside. :returns: List of folders where Qemu binaries MAY reside.
""" """
<<<<<<< HEAD
paths = []
=======
qemus = [] qemus = []
paths = set() paths = set()
>>>>>>> master
try: try:
paths.add(os.getcwd()) paths.add(os.getcwd())
except FileNotFoundError: except FileNotFoundError:
@ -76,18 +72,13 @@ class Qemu(BaseManager):
paths.add(os.path.join(os.environ["PROGRAMFILES"], "qemu")) paths.add(os.path.join(os.environ["PROGRAMFILES"], "qemu"))
elif sys.platform.startswith("darwin"): elif sys.platform.startswith("darwin"):
# add specific locations on Mac OS X regardless of what's in $PATH # add specific locations on Mac OS X regardless of what's in $PATH
<<<<<<< HEAD paths.update(["/usr/bin", "/usr/local/bin", "/opt/local/bin"])
paths.extend(["/usr/bin", "/usr/local/bin", "/opt/local/bin"])
=======
paths.update(["/usr/local/bin", "/opt/local/bin"])
>>>>>>> master
if hasattr(sys, "frozen"): if hasattr(sys, "frozen"):
try: try:
paths.add(os.path.abspath(os.path.join(os.getcwd(), "../../../qemu/bin/"))) paths.add(os.path.abspath(os.path.join(os.getcwd(), "../../../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:
<<<<<<< HEAD paths.add("/Applications/GNS3.app/Contents/Resources/qemu/bin")
paths.append(["/Applications/GNS3.app/Contents/Resources/qemu/bin"])
return paths return paths
@staticmethod @staticmethod
@ -100,10 +91,6 @@ class Qemu(BaseManager):
qemus = [] qemus = []
for path in Qemu.paths_list(): for path in Qemu.paths_list():
=======
paths.add("/Applications/GNS3.app/Contents/Resources/qemu/bin")
for path in paths:
>>>>>>> master
try: try:
for f in os.listdir(path): for f in os.listdir(path):
if (f.startswith("qemu-system") or f.startswith("qemu-kvm") or f == "qemu" or f == "qemu.exe") and \ if (f.startswith("qemu-system") or f.startswith("qemu-kvm") or f == "qemu" or f == "qemu.exe") and \