kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #2503 from dotcloud/2500-inspect-fix

Browse source 
Client: Inspect fix
This commit is contained in:
Victor Vieux 2013-11-01 15:24:05 -07:00
commit fc45535197
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
commands.go
View file

@ -655,7 +655,11 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
if err != nil { if err != nil {
obj, _, err = cli.call("GET", "/images/"+name+"/json", nil) obj, _, err = cli.call("GET", "/images/"+name+"/json", nil)
if err != nil { if err != nil {
fmt.Fprintf(cli.err, "No such image or container: %s\n", name) if strings.Contains(err.Error(), "No such") {
fmt.Fprintf(cli.err, "Error: No such image or container: %s\n", name)
} else {
fmt.Fprintf(cli.err, "%s", err)
}
status = 1 status = 1
continue continue
} }
@ -668,9 +672,11 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
} }
indented.WriteString(",") indented.WriteString(",")
} }
// Remove trailling ','
indented.Truncate(indented.Len() - 1)
if indented.Len() > 0 {
// Remove trailing ','
indented.Truncate(indented.Len() - 1)
}
fmt.Fprintf(cli.out, "[") fmt.Fprintf(cli.out, "[")
if _, err := io.Copy(cli.out, indented); err != nil { if _, err := io.Copy(cli.out, indented); err != nil {
return err return err