Merge branch 'master' into 2.0

This commit is contained in:
Julien Duponchelle committed 2016-08-29 14:08:23 +02:00
commit 72fe5d3489
14 files changed
+314 -30

No files matched your search

+4 -1
View File
@@ -66,7 +66,10 @@ class VirtualBox(BaseManager):
elif sys.platform.startswith("darwin"):
vboxmanage_path = "/Applications/VirtualBox.app/Contents/MacOS/VBoxManage"
else:
vboxmanage_path = shutil.which("vboxmanage")
vboxmanage_path = "vboxmanage"
if not os.path.abspath(vboxmanage_path):
vboxmanage_path = shutil.which(vboxmanage_path)
if not vboxmanage_path:
raise VirtualBoxError("Could not find VBoxManage")