builder/vmware: better error output from vmrun

ac58773e · Mitchell Hashimoto · f32d9879 · ac58773e
Commit ac58773e authored Sep 05, 2014 by Mitchell Hashimoto
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

builder/vmware/common/driver.go builder/vmware/common/driver.go +6 -1

No files found.
--- 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)