Merge pull request #20053 from smarterclayton/dont_duplicate_prefix

Auto commit by PR queue bot

Merge pull request #20053 from smarterclayton/dont_duplicate_prefix
9e7a0e2a · k8s-merge-robot · 311d8f8a · f9c48c86 · 9e7a0e2a
Commit 9e7a0e2a authored Jan 30, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

helpers.go pkg/kubectl/cmd/util/helpers.go +4 -1

No files found.
--- a/pkg/kubectl/cmd/util/helpers.go
+++ b/pkg/kubectl/cmd/util/helpers.go
@@ -125,7 +125,10 @@ func checkErr(err error, handleErr func(string)) {

 	msg, ok := StandardErrorMessage(err)
 	if !ok {
-		msg = fmt.Sprintf("error: %s", err.Error())
+		msg = err.Error()
+		if !strings.HasPrefix(msg, "error: ") {
+			msg = fmt.Sprintf("error: %s", msg)
+		}
 	}
 	handleErr(msg)
 }