Return long image ID
Return streamformatted error or "raw" error
| ... | ... |
@@ -481,7 +481,11 @@ func postImagesInsert(srv *Server, version float64, w http.ResponseWriter, r *ht |
| 481 | 481 |
sf := utils.NewStreamFormatter(version > 1.0) |
| 482 | 482 |
err := srv.ImageInsert(name, url, path, w, sf) |
| 483 | 483 |
if err != nil {
|
| 484 |
- w.Write(sf.FormatError(err)) |
|
| 484 |
+ if sf.Used() {
|
|
| 485 |
+ w.Write(sf.FormatError(err)) |
|
| 486 |
+ return nil |
|
| 487 |
+ } |
|
| 488 |
+ return err |
|
| 485 | 489 |
} |
| 486 | 490 |
|
| 487 | 491 |
return nil |
| ... | ... |
@@ -229,7 +229,7 @@ func (srv *Server) ImageInsert(name, url, path string, out io.Writer, sf *utils. |
| 229 | 229 |
if err != nil {
|
| 230 | 230 |
return err |
| 231 | 231 |
} |
| 232 |
- out.Write(sf.FormatStatus(utils.TruncateID(img.ID), "Image created")) |
|
| 232 |
+ out.Write(sf.FormatStatus(img.ID, "Image created")) |
|
| 233 | 233 |
return nil |
| 234 | 234 |
} |
| 235 | 235 |
|