From 99d8237f8bd88c1be35bb0e8f57e21d77c93cdbc Mon Sep 17 00:00:00 2001 From: Aaron Prindle Date: Mon, 21 Aug 2017 16:31:50 -0700 Subject: [PATCH] Fix status issue with none driver where CombinedOutput was causing errors --- pkg/minikube/cluster/cluster.go | 11 ++++++++--- pkg/minikube/machine/drivers/none/none.go | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/pkg/minikube/cluster/cluster.go b/pkg/minikube/cluster/cluster.go index fd5787b22b..e7226185ce 100644 --- a/pkg/minikube/cluster/cluster.go +++ b/pkg/minikube/cluster/cluster.go @@ -17,6 +17,7 @@ limitations under the License. package cluster import ( + "bytes" "encoding/json" "flag" "fmt" @@ -602,11 +603,15 @@ func RunCommand(h *host.Host, command string, sudo bool) (string, error) { if sudo { cmd = exec.Command("sudo", "/bin/bash", "-c", command) } - out, err := cmd.CombinedOutput() + var out bytes.Buffer + var stderr bytes.Buffer + cmd.Stdout = &out + cmd.Stderr = &stderr + err := cmd.Run() if err != nil { - return "", errors.Wrap(err, string(out)) + return "", errors.Wrap(err, stderr.String()) } - return string(out), err + return out.String(), err } out, err := h.RunSSHCommand(command) if err != nil { diff --git a/pkg/minikube/machine/drivers/none/none.go b/pkg/minikube/machine/drivers/none/none.go index bc0364ace5..613bea531a 100644 --- a/pkg/minikube/machine/drivers/none/none.go +++ b/pkg/minikube/machine/drivers/none/none.go @@ -17,6 +17,7 @@ limitations under the License. package none import ( + "bytes" "fmt" "os" "os/exec" @@ -199,9 +200,13 @@ func runCommand(command string, sudo bool) (string, error) { if sudo { cmd = exec.Command("sudo", "/bin/bash", "-c", command) } - out, err := cmd.CombinedOutput() + var out bytes.Buffer + var stderr bytes.Buffer + cmd.Stdout = &out + cmd.Stderr = &stderr + err := cmd.Run() if err != nil { - return "", errors.Wrap(err, string(out)) + return "", errors.Wrap(err, stderr.String()) } - return string(out), nil + return out.String(), nil }