p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Fprintf instead of Fprintln

Browse Source 
Upstream-commit: 279db68b4600551706dd1185ad1b05b374e9e05c
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-05-07 16:36:49 -07:00
parent 455a7b25f7
commit d8a225f5d5
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/engine/api.go
View File

@ -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
}

2
components/engine/server.go
View File

@ -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"