From 1e6fd243b122bf26dbfb375f8cc53875bc265aa6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Sun, 23 Jun 2013 21:19:41 -0700
Subject: [PATCH] builder/virtualbox: Output VBoxManage stderr in error

---
 builder/virtualbox/driver.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/builder/virtualbox/driver.go b/builder/virtualbox/driver.go
index 1723c1fe6..a0b6ee343 100644
--- a/builder/virtualbox/driver.go
+++ b/builder/virtualbox/driver.go
@@ -88,8 +88,15 @@ func (d *VBox42Driver) VBoxManage(args ...string) error {
 	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("VBoxManage error: %s", stderrString)
+	}
+
+	log.Printf("stdout: %s", stdoutString)
+	log.Printf("stderr: %s", stderrString)
 
 	return err
 }