From 08f0f1ee1db2dea79e622764891cb8b1432bcab1 Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Wed, 19 Nov 2014 09:42:10 +0100 Subject: [PATCH] Fixed error reporting Removed redundant print line and fixed handling of command-less docker invocation. Signed-off-by: Michal Minar --- api/client/commands.go | 1 - utils/flags.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/api/client/commands.go b/api/client/commands.go index 6c919e106..5b0ee1175 100644 --- a/api/client/commands.go +++ b/api/client/commands.go @@ -63,7 +63,6 @@ func (cli *DockerCli) CmdHelp(args ...string) error { if len(args) > 0 { method, exists := cli.getMethod(args[0]) if !exists { - fmt.Fprintf(cli.err, "Error: Command not found: %s\n", args[0]) fmt.Fprintf(cli.err, "docker: '%s' is not a docker command. See 'docker --help'.\n", args[0]) os.Exit(1) } else { diff --git a/utils/flags.go b/utils/flags.go index fdf57b1b2..92449070e 100644 --- a/utils/flags.go +++ b/utils/flags.go @@ -26,9 +26,9 @@ func ParseFlags(cmd *flag.FlagSet, args []string, withHelp bool) error { if str := cmd.CheckArgs(); str != "" { if withHelp { if os.Args[0] == cmd.Name() { - str += ". See '" + os.Args[0] + " " + cmd.Name() + " --help'" - } else { str += ". See '" + os.Args[0] + " --help'" + } else { + str += ". See '" + os.Args[0] + " " + cmd.Name() + " --help'" } } fmt.Fprintf(cmd.Out(), "docker: %s.\n", str)