From 7cfdadb65764f6befa0a3ddc318e9ae3f6a7ec03 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Wed, 31 Aug 2016 12:43:01 +0200 Subject: [PATCH] api: client: container: update: fix help text Before: $ docker update --cpu-period Status: flag needs an argument: --cpu-period See 'docker update --help'., Code: 125 After: $ docker update --cpu-period flag needs an argument: --cpu-period See 'docker update --help'. Also remove flagErrorFunc function which isn't needed anymore. Signed-off-by: Antonio Murdaca Upstream-commit: c2c2617534685917c4a1c2367af861c598cc050a Component: engine --- components/engine/api/client/container/run.go | 7 ------- components/engine/api/client/container/update.go | 1 - 2 files changed, 8 deletions(-) diff --git a/components/engine/api/client/container/run.go b/components/engine/api/client/container/run.go index c72f8d2fd8..652739f5df 100644 --- a/components/engine/api/client/container/run.go +++ b/components/engine/api/client/container/run.go @@ -67,13 +67,6 @@ func NewRunCommand(dockerCli *client.DockerCli) *cobra.Command { return cmd } -func flagErrorFunc(cmd *cobra.Command, err error) error { - return cli.StatusError{ - Status: cli.FlagErrorFunc(cmd, err).Error(), - StatusCode: 125, - } -} - func runRun(dockerCli *client.DockerCli, flags *pflag.FlagSet, opts *runOptions, copts *runconfigopts.ContainerOptions) error { stdout, stderr, stdin := dockerCli.Out(), dockerCli.Err(), dockerCli.In() client := dockerCli.Client() diff --git a/components/engine/api/client/container/update.go b/components/engine/api/client/container/update.go index f9d52369c0..cc464a7859 100644 --- a/components/engine/api/client/container/update.go +++ b/components/engine/api/client/container/update.go @@ -46,7 +46,6 @@ func NewUpdateCommand(dockerCli *client.DockerCli) *cobra.Command { return runUpdate(dockerCli, &opts) }, } - cmd.SetFlagErrorFunc(flagErrorFunc) flags := cmd.Flags() flags.Uint16Var(&opts.blkioWeight, "blkio-weight", 0, "Block IO (relative weight), between 10 and 1000")