Fixes #1062, ESXi Driver supports PACKER_CACHE_DIR

6dc858e6 · Yuya Kusakabe · c1cfd1da · 6dc858e6
Commit 6dc858e6 authored May 09, 2014 by Yuya Kusakabe
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

builder/vmware/iso/driver_esx5.go builder/vmware/iso/driver_esx5.go +2 -4

No files found.
--- a/builder/vmware/iso/driver_esx5.go
+++ b/builder/vmware/iso/driver_esx5.go
@@ -260,10 +260,8 @@ func (d *ESX5Driver) String() string {
 }
 func (d *ESX5Driver) datastorePath(path string) string {
-	if filepath.IsAbs(path) {
+	baseDir := filepath.Base(filepath.Dir(path))
-		return filepath.Join("/vmfs/volumes", d.Datastore, strings.Replace(path, "/", "", 1))
+	return filepath.Join("/vmfs/volumes", d.Datastore, baseDir, filepath.Base(path))
-	}
-	return filepath.Join("/vmfs/volumes", d.Datastore, path)
 }
 func (d *ESX5Driver) connect() error {