Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle 2016-05-17 09:39:36 +02:00
commit b44c2ea713
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8

View File

@ -113,7 +113,7 @@ class VMware(BaseManager):
raise VMwareError("vmrun {} is not accessible".format(vmrun_path)) raise VMwareError("vmrun {} is not accessible".format(vmrun_path))
if not os.access(vmrun_path, os.X_OK): if not os.access(vmrun_path, os.X_OK):
raise VMwareError("vmrun is not executable") raise VMwareError("vmrun is not executable")
if os.path.basename(vmrun_path) not in ["vmrun", "vmrun.exe"]: if os.path.basename(vmrun_path).lower() not in ["vmrun", "vmrun.exe"]:
raise VMwareError("Invalid vmrun executable name {}".format(os.path.basename(vmrun_path))) raise VMwareError("Invalid vmrun executable name {}".format(os.path.basename(vmrun_path)))
self._vmrun_path = vmrun_path self._vmrun_path = vmrun_path