rebase master

Upstream-commit: c46382ba29c82eedab2b1601da5a81a047f078c2 Component: engine
2013-06-13 17:58:06 +00:00
parent 0a236e493a 87329359a3
commit 4147a474f5
20 changed files with 454 additions and 25 deletions
@@ -581,11 +581,22 @@ func (cli *DockerCli) CmdRmi(args ...string) error {
 	}

 	for _, name := range cmd.Args() {
-		_, _, err := cli.call("DELETE", "/images/"+name, nil)
+		body, _, err := cli.call("DELETE", "/images/"+name, nil)
 		if err != nil {
-			fmt.Printf("%s", err)
+			fmt.Fprintf(os.Stderr, "%s", err)
 		} else {
-			fmt.Println(name)
+			var outs []APIRmi
+			err = json.Unmarshal(body, &outs)
+			if err != nil {
+				return err
+			}
+			for _, out := range outs {
+				if out.Deleted != "" {
+					fmt.Println("Deleted:", out.Deleted)
+				} else {
+					fmt.Println("Untagged:", out.Untagged)
+				}
+			}
 		}
 	}
 	return nil