Merge pull request #2174 from brandonheller/master

vmware/iso: support hierarchical output directories

Merge pull request #2174 from brandonheller/master
vmware/iso: support hierarchical output directories
1d653efe · Mitchell Hashimoto · fafdfc96 · a7eeb6a6 · 1d653efe
Commit 1d653efe authored Jun 10, 2015 by Mitchell Hashimoto
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/builder/vmware/iso/driver_esx5.go
+++ b/builder/vmware/iso/driver_esx5.go
@@ -311,8 +311,8 @@ func (d *ESX5Driver) String() string {
 }

 func (d *ESX5Driver) datastorePath(path string) string {
-	baseDir := filepath.Base(filepath.Dir(path))
-	return filepath.ToSlash(filepath.Join("/vmfs/volumes", d.Datastore, baseDir, filepath.Base(path)))
+	dirPath := filepath.Dir(path)
+	return filepath.ToSlash(filepath.Join("/vmfs/volumes", d.Datastore, dirPath, filepath.Base(path)))
 }

 func (d *ESX5Driver) cachePath(path string) string {