Merge pull request #7310 from hashicorp/fix_7286

also strip \r to work around windows file ending strangeness
7 years ago · cb5c896c01
parent be21850e32 bd3339f1f9
commit cb5c896c01
1 changed files with 1 additions and 1 deletions
--- a/builder/vmware/common/driver_esx5.go
+++ b/builder/vmware/common/driver_esx5.go
@ -47,7 +47,7 @@ type ESX5Driver struct {

 func (d *ESX5Driver) Clone(dst, src string, linked bool) error {

-	linesToArray := func(lines string) []string { return strings.Split(strings.Trim(lines, "\n"), "\n") }
+	linesToArray := func(lines string) []string { return strings.Split(strings.Trim(lines, "\r\n"), "\n") }

 	d.SetOutputDir(path.Dir(filepath.ToSlash(dst)))
 	srcVmx := d.datastorePath(src)