From 3c712ae30a0ca3fde0ed5f011a650d37e0152d65 Mon Sep 17 00:00:00 2001
From: Evan Hazlett <ejhazlett@gmail.com>
Date: Sat, 5 Sep 2015 08:57:03 -0400
Subject: [PATCH] change debug env var to MACHINE_DEBUG

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
---
 drivers/virtualbox/virtualbox.go     | 2 +-
 drivers/vmwarefusion/vmrun_darwin.go | 4 ++--
 log/log.go                           | 4 ++--
 main.go                              | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/virtualbox/virtualbox.go b/drivers/virtualbox/virtualbox.go
index a41d1319d8..9052b0872b 100644
--- a/drivers/virtualbox/virtualbox.go
+++ b/drivers/virtualbox/virtualbox.go
@@ -661,7 +661,7 @@ func createDiskImage(dest string, size int, r io.Reader) error {
 	cmd := exec.Command(vboxManageCmd, "convertfromraw", "stdin", dest,
 		fmt.Sprintf("%d", sizeBytes), "--format", "VMDK")
 
-	if os.Getenv("DEBUG") != "" {
+	if os.Getenv("MACHINE_DEBUG") != "" {
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
 	}
diff --git a/drivers/vmwarefusion/vmrun_darwin.go b/drivers/vmwarefusion/vmrun_darwin.go
index 917c1347fd..ee5807ce0b 100644
--- a/drivers/vmwarefusion/vmrun_darwin.go
+++ b/drivers/vmwarefusion/vmrun_darwin.go
@@ -28,7 +28,7 @@ var (
 
 func vmrun(args ...string) (string, string, error) {
 	cmd := exec.Command(vmrunbin, args...)
-	if os.Getenv("DEBUG") != "" {
+	if os.Getenv("MACHINE_DEBUG") != "" {
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
 	}
@@ -51,7 +51,7 @@ func vmrun(args ...string) (string, string, error) {
 // Make a vmdk disk image with the given size (in MB).
 func vdiskmanager(dest string, size int) error {
 	cmd := exec.Command(vdiskmanbin, "-c", "-t", "0", "-s", fmt.Sprintf("%dMB", size), "-a", "lsilogic", dest)
-	if os.Getenv("DEBUG") != "" {
+	if os.Getenv("MACHINE_DEBUG") != "" {
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
 	}
diff --git a/log/log.go b/log/log.go
index e7e900c032..71439443f1 100644
--- a/log/log.go
+++ b/log/log.go
@@ -42,11 +42,11 @@ var (
 // TODO: I think this is superflous and can be replaced by one check for if
 // debug is on that sets a variable in this module.
 func isDebug() bool {
-	debugEnv := os.Getenv("DEBUG")
+	debugEnv := os.Getenv("MACHINE_DEBUG")
 	if debugEnv != "" {
 		showDebug, err := strconv.ParseBool(debugEnv)
 		if err != nil {
-			fmt.Fprintln(os.Stderr, "Error parsing boolean value from DEBUG: %s", err)
+			fmt.Fprintln(os.Stderr, "Error parsing boolean value from MACHINE_DEBUG: %s", err)
 			os.Exit(1)
 		}
 		return showDebug
diff --git a/main.go b/main.go
index 7f640babd0..46014a9915 100644
--- a/main.go
+++ b/main.go
@@ -47,7 +47,7 @@ Options:
 func main() {
 	for _, f := range os.Args {
 		if f == "-D" || f == "--debug" || f == "-debug" {
-			os.Setenv("DEBUG", "1")
+			os.Setenv("MACHINE_DEBUG", "1")
 		}
 	}