diff --git a/builder/vmware/common/driver.go b/builder/vmware/common/driver.go index 6e879e5f6..d8180b520 100644 --- a/builder/vmware/common/driver.go +++ b/builder/vmware/common/driver.go @@ -148,7 +148,7 @@ func normalizeVersion(version string) (string, error) { i, err := strconv.Atoi(version) if err != nil { return "", fmt.Errorf( - "VMWare WS version '%s' is not numeric", version) + "VMWare version '%s' is not numeric", version) } return fmt.Sprintf("%02d", i), nil @@ -167,7 +167,7 @@ func compareVersions(versionFound string, versionWanted string) error { if found < wanted { return fmt.Errorf( - "VMWare WS %s, or greater, is required. Found version: %s", versionWanted, versionFound) + "VMWare WS version %s, or greater, is required. Found version: %s", versionWanted, versionFound) } return nil diff --git a/builder/vmware/common/driver_workstation10_windows.go b/builder/vmware/common/driver_workstation10_windows.go index 9b036a9bb..11721e950 100644 --- a/builder/vmware/common/driver_workstation10_windows.go +++ b/builder/vmware/common/driver_workstation10_windows.go @@ -27,7 +27,7 @@ func workstationVerifyVersion(version string) error { matches := versionRe.FindStringSubmatch(productVersion) if matches == nil { return fmt.Errorf( - "Could not find VMware WS version in registry key %s/subkey: %s", key, subkey, productVersion) + `Could not find a VMware WS version in registry key %s\%s: '%s'`, key, subkey, productVersion) } log.Printf("Detected VMware WS version: %s", matches[1]) diff --git a/builder/vmware/common/driver_workstation9.go b/builder/vmware/common/driver_workstation9.go index 6dd7048cc..76af4419b 100644 --- a/builder/vmware/common/driver_workstation9.go +++ b/builder/vmware/common/driver_workstation9.go @@ -23,7 +23,7 @@ type Workstation9Driver struct { } func (d *Workstation9Driver) Clone(dst, src string) error { - return errors.New("Cloning is not supported with VMWare WS 9. Please use VMWare WS 10, or greater.") + return errors.New("Cloning is not supported with VMWare WS version 9. Please use VMWare WS version 10, or greater.") } func (d *Workstation9Driver) CompactDisk(diskPath string) error { diff --git a/builder/vmware/common/driver_workstation_unix.go b/builder/vmware/common/driver_workstation_unix.go index efa672862..63b379e7c 100644 --- a/builder/vmware/common/driver_workstation_unix.go +++ b/builder/vmware/common/driver_workstation_unix.go @@ -53,7 +53,7 @@ func workstationVmnetnatConfPath() string { func workstationVerifyVersion(version string) error { if runtime.GOOS != "linux" { - return fmt.Errorf("The VMWare WS %s driver is only supported on Linux, and Windows, at the moment. Your OS: %s", version, runtime.GOOS) + return fmt.Errorf("The VMWare WS version %s driver is only supported on Linux, and Windows, at the moment. Your OS: %s", version, runtime.GOOS) } //TODO(pmyjavec) there is a better way to find this, how?