From d49dbca38101acef706dbecf8fb7428fed0b84a8 Mon Sep 17 00:00:00 2001 From: allencloud Date: Mon, 19 Dec 2016 14:45:48 +0800 Subject: [PATCH] change minor mistake of spelling Signed-off-by: allencloud Upstream-commit: 3c8d009c7a8504ab552606cf2158e56fbaf7b27a Component: cli --- components/cli/command/registry/logout.go | 2 +- components/cli/command/system/info.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/cli/command/registry/logout.go b/components/cli/command/registry/logout.go index 877e60e8cc..f1f397fa08 100644 --- a/components/cli/command/registry/logout.go +++ b/components/cli/command/registry/logout.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" ) -// NewLogoutCommand creates a new `docker login` command +// NewLogoutCommand creates a new `docker logout` command func NewLogoutCommand(dockerCli *command.DockerCli) *cobra.Command { cmd := &cobra.Command{ Use: "logout [SERVER]", diff --git a/components/cli/command/system/info.go b/components/cli/command/system/info.go index e0b8767377..973ee18241 100644 --- a/components/cli/command/system/info.go +++ b/components/cli/command/system/info.go @@ -277,7 +277,7 @@ func prettyPrintInfo(dockerCli *command.DockerCli, info types.Info) error { for _, label := range info.Labels { stringSlice := strings.SplitN(label, "=", 2) if len(stringSlice) > 1 { - // If there is a conflict we will throw out an warning + // If there is a conflict we will throw out a warning if v, ok := labelMap[stringSlice[0]]; ok && v != stringSlice[1] { fmt.Fprintln(dockerCli.Err(), "WARNING: labels with duplicate keys and conflicting values have been deprecated") break