docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Edits after code review 

Return long image ID
Return streamformatted error or "raw" error
This commit is contained in:
Mark Allen 2013-11-10 00:06:55 -06:00
parent bf8e0277bb
commit 8cc19765b4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api.go
View File

@ -481,7 +481,11 @@ func postImagesInsert(srv *Server, version float64, w http.ResponseWriter, r *ht
sf := utils.NewStreamFormatter(version > 1.0) sf := utils.NewStreamFormatter(version > 1.0)
err := srv.ImageInsert(name, url, path, w, sf) err := srv.ImageInsert(name, url, path, w, sf)
if err != nil { if err != nil {
if sf.Used() {
w.Write(sf.FormatError(err)) w.Write(sf.FormatError(err))
return nil
}
return err
} }
return nil return nil

2
server.go
View File

@ -229,7 +229,7 @@ func (srv *Server) ImageInsert(name, url, path string, out io.Writer, sf *utils.
if err != nil { if err != nil {
return err return err
} }
out.Write(sf.FormatStatus(utils.TruncateID(img.ID), "Image created")) out.Write(sf.FormatStatus(img.ID, "Image created"))
return nil return nil
} }