From bcccc8a2e2d92345544e6582eaf7c18b015186fc Mon Sep 17 00:00:00 2001 From: Shuwei Hao Date: Mon, 7 Dec 2015 03:38:47 +0000 Subject: [PATCH] Modify docker network inspect client to check statusCode instead of string contain Signed-off-by: Shuwei Hao Upstream-commit: 6306eb3cd320bed914104cfd7110fe0aac2c3e4f Component: engine --- components/engine/api/client/network.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/engine/api/client/network.go b/components/engine/api/client/network.go index d5853918de..059a0faf56 100644 --- a/components/engine/api/client/network.go +++ b/components/engine/api/client/network.go @@ -6,6 +6,7 @@ import ( "fmt" "io" "net" + "net/http" "strings" "text/tabwriter" "text/template" @@ -224,9 +225,9 @@ func (cli *DockerCli) CmdNetworkInspect(args ...string) error { var networks []types.NetworkResource buf := new(bytes.Buffer) for _, name := range cmd.Args() { - obj, _, err := readBody(cli.call("GET", "/networks/"+name, nil, nil)) + obj, statusCode, err := readBody(cli.call("GET", "/networks/"+name, nil, nil)) if err != nil { - if strings.Contains(err.Error(), "not found") { + if statusCode == http.StatusNotFound { fmt.Fprintf(cli.err, "Error: No such network: %s\n", name) } else { fmt.Fprintf(cli.err, "%s\n", err)