From c46165de19c9ad621a769d6f99ff82e0a98506cf Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Sun, 9 Aug 2015 11:41:52 -0400
Subject: [PATCH] Extra newlines in error output

StandardErrorMessage does not have a newline by default, other
error messages should not end with a newline.
---
 pkg/client/helper.go            | 2 +-
 pkg/kubectl/cmd/util/helpers.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/client/helper.go b/pkg/client/helper.go
index 4d93ef7f245..f64a0949c3f 100644
--- a/pkg/client/helper.go
+++ b/pkg/client/helper.go
@@ -188,7 +188,7 @@ func NegotiateVersion(client *Client, c *Config, version string, clientRegistere
 	}
 	apiVersions, err := client.ServerAPIVersions()
 	if err != nil {
-		return "", fmt.Errorf("couldn't read version from server: %v\n", err)
+		return "", fmt.Errorf("couldn't read version from server: %v", err)
 	}
 	serverVersions := util.StringSet{}
 	for _, v := range apiVersions.Versions {
diff --git a/pkg/kubectl/cmd/util/helpers.go b/pkg/kubectl/cmd/util/helpers.go
index 668c37464a0..95bd14e3732 100644
--- a/pkg/kubectl/cmd/util/helpers.go
+++ b/pkg/kubectl/cmd/util/helpers.go
@@ -93,7 +93,7 @@ func checkErr(err error, handleErr func(string)) {
 
 	msg, ok := StandardErrorMessage(err)
 	if !ok {
-		msg = fmt.Sprintf("error: %s\n", err.Error())
+		msg = fmt.Sprintf("error: %s", err.Error())
 	}
 	handleErr(msg)
 }