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

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

Browse Source
This commit is contained in:
grossmj 2015-09-09 02:39:06 -06:00
commit 46698924fd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gns3server/modules/vmware/vmware_vm.py
View File

@ -397,7 +397,8 @@ class VMwareVM(BaseVM):
Starts this VMware VM. 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") raise VMwareError("VM locked, it is either running or being edited in VMware")
ubridge_path = self.ubridge_path ubridge_path = self.ubridge_path