From d316eb7e963244470b138d9169f8f30b4c496f0c Mon Sep 17 00:00:00 2001 From: David Gageot Date: Tue, 27 Oct 2015 15:22:38 +0100 Subject: [PATCH] Print a better error when virtualbox fails Instead of printing `exit status 1` we'll print the stderr output Signed-off-by: David Gageot --- drivers/virtualbox/vbm.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/virtualbox/vbm.go b/drivers/virtualbox/vbm.go index 7f83e7ed80..6dffeff896 100644 --- a/drivers/virtualbox/vbm.go +++ b/drivers/virtualbox/vbm.go @@ -61,17 +61,21 @@ func (v *VBoxCmdManager) vbmOutErr(args ...string) (string, string, error) { log.Debugf("STDOUT:\n{\n%v}", stdout.String()) log.Debugf("STDERR:\n{\n%v}", stderrStr) } + if err != nil { if ee, ok := err.(*exec.Error); ok && ee.Err == exec.ErrNotFound { err = ErrVBMNotFound } - } else { + } + + if err == nil || strings.HasPrefix(err.Error(), "exit status ") { // VBoxManage will sometimes not set the return code, but has a fatal error // such as VBoxManage.exe: error: VT-x is not available. (VERR_VMX_NO_VMX) if strings.Contains(stderrStr, "error:") { - err = fmt.Errorf("%v %v failed: %v", vboxManageCmd, strings.Join(args, " "), stderrStr) + err = fmt.Errorf("%v %v failed:\n%v", vboxManageCmd, strings.Join(args, " "), stderrStr) } } + return stdout.String(), stderrStr, err }