From d8a225f5d51cc5d243bfb26837444596d7a81e34 Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume.charmes@dotcloud.com>
Date: Tue, 7 May 2013 16:36:49 -0700
Subject: [PATCH] Use Fprintf instead of Fprintln Upstream-commit:
 279db68b4600551706dd1185ad1b05b374e9e05c Component: engine

---
 components/engine/api.go    | 9 ++++++---
 components/engine/server.go | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/components/engine/api.go b/components/engine/api.go
index 2f00e300d9..23ccd403bf 100644
--- a/components/engine/api.go
+++ b/components/engine/api.go
@@ -437,7 +437,8 @@ func postImagesInsert(srv *Server, w http.ResponseWriter, r *http.Request) error
 	}
 	fmt.Fprintf(file, "HTTP/1.1 200 OK\r\nContent-Type: raw-stream-hijack\r\n\r\n")
 	if err := srv.ImageInsert(name, url, path, file); err != nil {
-		fmt.Fprintln(file, "Error: "+err.Error())
+		fmt.Fprintf(file, "Error: %s\n", err)
+		return err
 	}
 	return nil
 }
@@ -467,7 +468,8 @@ func postImagesPush(srv *Server, w http.ResponseWriter, r *http.Request) error {
 	}
 	fmt.Fprintf(file, "HTTP/1.1 200 OK\r\nContent-Type: raw-stream-hijack\r\n\r\n")
 	if err := srv.ImagePush(name, registry, file); err != nil {
-		fmt.Fprintln(file, "Error: "+err.Error())
+		fmt.Fprintln(file, "Error: $s\n", err)
+		return err
 	}
 	return nil
 }
@@ -488,7 +490,8 @@ func postBuild(srv *Server, w http.ResponseWriter, r *http.Request) error {
 	}
 	fmt.Fprintf(file, "HTTP/1.1 200 OK\r\nContent-Type: raw-stream-hijack\r\n\r\n")
 	if err := srv.ImageCreateFormFile(file); err != nil {
-		fmt.Fprintln(file, "Error: "+err.Error())
+		fmt.Fprintln(file, "Error: %s\n", err)
+		return err
 	}
 	return nil
 }
diff --git a/components/engine/server.go b/components/engine/server.go
index b22e494401..7399a399d9 100644
--- a/components/engine/server.go
+++ b/components/engine/server.go
@@ -342,7 +342,7 @@ func (srv *Server) ImageImport(src, repo, tag string, file *os.File) error {
 	} else {
 		u, err := url.Parse(src)
 		if err != nil {
-			fmt.Fprintln(file, "Error: "+err.Error())
+			fmt.Fprintf(file, "Error: %s\n", err)
 		}
 		if u.Scheme == "" {
 			u.Scheme = "http"