NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 05:51:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.5

Browse Source
This commit is contained in:
Julien Duponchelle committed 2016-04-26 11:49:24 +02:00
2 parents 7ffdd0fab1 6d6e8196d2
commit 1d08d4a5fa
8 files changed
+102 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/modules/vmware/__init__.py
+1 -1
View File
@@ -618,7 +618,7 @@ class VMware(BaseManager):
yield from self.check_vmware_version()
inventory_path = self.get_vmware_inventory_path()
if os.path.exists(inventory_path) and self.host_type == "ws":
if os.path.exists(inventory_path) and self.host_type != "player":
# inventory may exist for VMware player if VMware workstation has been previously installed
return self._get_vms_from_inventory(inventory_path)
else: