clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 15:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle bad options better

Browse Source 
* Do not log bad options error message twice, e.g.:

    $ docker run --pouet
    flag provided but not defined: --pouet
    See 'docker run --help'.
    2014/11/05 21:41:23 flag provided but not defined: --pouet

  With this patch just the first two lines will be produced.

* Print 'docker' just once when run without a command, e.g.:

    $ docker --hel
    flag provided but not defined: --hel
    See 'docker docker --help'.

Signed-off-by: Michal Minar <miminar@redhat.com>
This commit is contained in:
Michal Minar
2015-01-06 13:44:27 +01:00
parent 41be2f73c7
commit 1d09fc22ca
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/client/commands.go
+3 -3
View File
@@ -2187,7 +2187,7 @@ func (cli *DockerCli) CmdCreate(args ...string) error {
config, hostConfig, cmd, err := runconfig.Parse(cmd, args)
if err != nil {
return err
return &utils.StatusError{StatusCode: 1}
}
if config.Image == "" {
cmd.Usage()
@@ -2223,7 +2223,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {
config, hostConfig, cmd, err := runconfig.Parse(cmd, args)
if err != nil {
return err
return &utils.StatusError{StatusCode: 1}
}
if config.Image == "" {
cmd.Usage()
@@ -2511,7 +2511,7 @@ func (cli *DockerCli) CmdExec(args ...string) error {
execConfig, err := runconfig.ParseExec(cmd, args)
if execConfig.Container == "" || err != nil {
return err
return &utils.StatusError{StatusCode: 1}
}
stream, _, err := cli.call("POST", "/containers/"+execConfig.Container+"/exec", execConfig, false)