From bd3339f1f93a4392ff0ac65d93c126cfff8786ef Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 13 Feb 2019 15:41:37 -0800 Subject: [PATCH] also strip \r to work around windows file ending strangeness --- builder/vmware/common/driver_esx5.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/vmware/common/driver_esx5.go b/builder/vmware/common/driver_esx5.go index 602680ddc..4b083e5ff 100644 --- 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)