Merge branch 'master' into 1.5

This commit is contained in:
Julien Duponchelle committed 2016-04-07 14:44:56 +02:00
commit f1737a6e43
2 files changed
+24 -1

No files matched your search

+2
View File
@@ -144,6 +144,8 @@ class VMwareVM(BaseVM):
yield from self.manager.check_vmrun_version()
if self._linked_clone and not os.path.exists(os.path.join(self.working_dir, os.path.basename(self._vmx_path))):
if self.manager.host_type == "player":
raise VMwareError("Linked clones are not supported by VMware Player")
# create the base snapshot for linked clones
base_snapshot_name = "GNS3 Linked Base for clones"
vmsd_path = os.path.splitext(self._vmx_path)[0] + ".vmsd"