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

Lower VMware requirements to Workstation version 10 and Player version 6.

Browse Source
This commit is contained in:
grossmj 2015-08-14 20:35:04 -06:00
parent ab3700854c
commit a16d6ac88f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gns3server/modules/vmware/__init__.py
View File

@ -157,14 +157,14 @@ class VMware(BaseManager):
player_version = self._find_vmware_version_registry(r"SOFTWARE\Wow6432Node\VMware, Inc.\VMware Player") player_version = self._find_vmware_version_registry(r"SOFTWARE\Wow6432Node\VMware, Inc.\VMware Player")
if player_version: if player_version:
log.debug("VMware Player version {} detected".format(player_version)) log.debug("VMware Player version {} detected".format(player_version))
if int(player_version) < 7: if int(player_version) < 6:
raise VMwareError("Using VMware Player requires version 7 or above") raise VMwareError("Using VMware Player requires version 6 or above")
else: else:
log.warning("Could not find VMware version") log.warning("Could not find VMware version")
else: else:
log.debug("VMware Workstation version {} detected".format(ws_version)) log.debug("VMware Workstation version {} detected".format(ws_version))
if int(ws_version) < 11: if int(ws_version) < 10:
raise VMwareError("Using VMware Workstation requires version 11 or above") raise VMwareError("Using VMware Workstation requires version 10 or above")
return return
else: else:
if sys.platform.startswith("darwin"): if sys.platform.startswith("darwin"):
@ -182,14 +182,14 @@ class VMware(BaseManager):
if match: if match:
version = match.group(1) version = match.group(1)
log.debug("VMware Workstation version {} detected".format(version)) log.debug("VMware Workstation version {} detected".format(version))
if int(version) < 11: if int(version) < 10:
raise VMwareError("Using VMware Workstation requires version 11 or above") raise VMwareError("Using VMware Workstation requires version 10 or above")
match = re.search("VMware Player ([0-9]+)\.", output) match = re.search("VMware Player ([0-9]+)\.", output)
if match: if match:
version = match.group(1) version = match.group(1)
log.debug("VMware Player version {} detected".format(version)) log.debug("VMware Player version {} detected".format(version))
if int(version) < 7: if int(version) < 6:
raise VMwareError("Using VMware Player requires version 11 or above") raise VMwareError("Using VMware Player requires version 6 or above")
if version is None: if version is None:
log.warning("Could not find VMware version") log.warning("Could not find VMware version")
except (OSError, subprocess.SubprocessError) as e: except (OSError, subprocess.SubprocessError) as e: