builder/vmware: better error output from vmrun

2014-09-05 11:27:33 -07:00 · 2014-09-05 11:27:33 -07:00 · ac58773eed
parent f32d9879dc
commit ac58773eed
1 changed files with 6 additions and 1 deletions
--- a/builder/vmware/common/driver.go
+++ b/builder/vmware/common/driver.go
@ -129,7 +129,12 @@ func runAndLog(cmd *exec.Cmd) (string, string, error) {
 	stderrString := strings.TrimSpace(stderr.String())

 	if _, ok := err.(*exec.ExitError); ok {
-		err = fmt.Errorf("VMware error: %s", stderrString)
+		message := stderrString
+		if message == "" {
+			message = stdoutString
+		}
+
+		err = fmt.Errorf("VMware error: %s", message)
 	}

 	log.Printf("stdout: %s", stdoutString)