From d126c45d77eb292f5dbba0e2a644165423628e8b Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 16 Jul 2013 14:46:34 -0700 Subject: [PATCH] builder/vmware: workstation 9 show stderr if command fails --- builder/vmware/driver_workstation9.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/builder/vmware/driver_workstation9.go b/builder/vmware/driver_workstation9.go index eb41d9481..920291bee 100644 --- a/builder/vmware/driver_workstation9.go +++ b/builder/vmware/driver_workstation9.go @@ -143,8 +143,15 @@ func (d *Workstation9LinuxDriver) runAndLog(cmd *exec.Cmd) (string, string, erro cmd.Stderr = &stderr err := cmd.Run() - log.Printf("stdout: %s", strings.TrimSpace(stdout.String())) - log.Printf("stderr: %s", strings.TrimSpace(stderr.String())) + stdoutString := strings.TrimSpace(stdout.String()) + stderrString := strings.TrimSpace(stderr.String()) + + if _, ok := err.(*exec.ExitError); ok { + err = fmt.Errorf("VMware error: %s", stderrString) + } + + log.Printf("stdout: %s", stdoutString) + log.Printf("stderr: %s", stderrString) return stdout.String(), stderr.String(), err }