Commit d420947d authored by Ross Smith II's avatar Ross Smith II

added %s for productVersion param

parent 72924f0d
...@@ -148,7 +148,7 @@ func normalizeVersion(version string) (string, error) { ...@@ -148,7 +148,7 @@ func normalizeVersion(version string) (string, error) {
i, err := strconv.Atoi(version) i, err := strconv.Atoi(version)
if err != nil { if err != nil {
return "", fmt.Errorf( return "", fmt.Errorf(
"VMWare WS version '%s' is not numeric", version) "VMWare version '%s' is not numeric", version)
} }
return fmt.Sprintf("%02d", i), nil return fmt.Sprintf("%02d", i), nil
...@@ -167,7 +167,7 @@ func compareVersions(versionFound string, versionWanted string) error { ...@@ -167,7 +167,7 @@ func compareVersions(versionFound string, versionWanted string) error {
if found < wanted { if found < wanted {
return fmt.Errorf( 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 return nil
......
...@@ -27,7 +27,7 @@ func workstationVerifyVersion(version string) error { ...@@ -27,7 +27,7 @@ func workstationVerifyVersion(version string) error {
matches := versionRe.FindStringSubmatch(productVersion) matches := versionRe.FindStringSubmatch(productVersion)
if matches == nil { if matches == nil {
return fmt.Errorf( 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]) log.Printf("Detected VMware WS version: %s", matches[1])
......
...@@ -23,7 +23,7 @@ type Workstation9Driver struct { ...@@ -23,7 +23,7 @@ type Workstation9Driver struct {
} }
func (d *Workstation9Driver) Clone(dst, src string) error { 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 { func (d *Workstation9Driver) CompactDisk(diskPath string) error {
......
...@@ -53,7 +53,7 @@ func workstationVmnetnatConfPath() string { ...@@ -53,7 +53,7 @@ func workstationVmnetnatConfPath() string {
func workstationVerifyVersion(version string) error { func workstationVerifyVersion(version string) error {
if runtime.GOOS != "linux" { 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? //TODO(pmyjavec) there is a better way to find this, how?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment