1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-25 16:28:11 +00:00

Merge remote-tracking branch 'origin/unstable' into unstable

This commit is contained in:
grossmj 2015-09-09 02:39:06 -06:00
commit 46698924fd

View File

@ -397,7 +397,8 @@ class VMwareVM(BaseVM):
Starts this VMware VM.
"""
if os.path.exists(self._vmx_path + ".lck"):
# The lock dection is not working on OSX the .lck is never deleted
if os.path.exists(self._vmx_path + ".lck") and not sys.platform.startswith("darwin"):
raise VMwareError("VM locked, it is either running or being edited in VMware")
ubridge_path = self.ubridge_path