Просмотр исходного кода

Merge pull request #18462 from haoshuwei/modify-networkinspect-tocheckstatuscode

Modify docker network inspect client to check statusCode instead of s…
Vincent Demeester 9 лет назад
Родитель
Сommit
6fcd33b576
1 измененных файлов с 3 добавлено и 2 удалено
  1. 3 2
      api/client/network.go

+ 3 - 2
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)