beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use Fprintf instead of Fprintln

Browse source
This commit is contained in:
Guillaume J. Charmes 2013-05-07 16:36:49 -07:00
parent b56b2da5c5
commit 279db68b46
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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