Edits after code review
Return long image ID Return streamformatted error or "raw" error Upstream-commit: 8cc19765b48d1a429b840b731ed5fd5b81fbda3c Component: engine
This commit is contained in:
@ -481,7 +481,11 @@ func postImagesInsert(srv *Server, version float64, w http.ResponseWriter, r *ht
|
||||
sf := utils.NewStreamFormatter(version > 1.0)
|
||||
err := srv.ImageInsert(name, url, path, w, sf)
|
||||
if err != nil {
|
||||
w.Write(sf.FormatError(err))
|
||||
if sf.Used() {
|
||||
w.Write(sf.FormatError(err))
|
||||
return nil
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
@ -229,7 +229,7 @@ func (srv *Server) ImageInsert(name, url, path string, out io.Writer, sf *utils.
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
out.Write(sf.FormatStatus(utils.TruncateID(img.ID), "Image created"))
|
||||
out.Write(sf.FormatStatus(img.ID, "Image created"))
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user