Updated vendoring

Updated vendoring for getting changes from docker/cli
for build key in v3
(since docker/cli#481 is merged now)
This commit is contained in:
Suraj Narwade
2017-09-26 19:37:24 +05:30
parent 99f88ef15c
commit bd53d8b4ba
156 changed files with 14948 additions and 47936 deletions
+3 -10
View File
@@ -1249,20 +1249,13 @@ func (c *Command) persistentFlag(name string) (flag *flag.Flag) {
}
// ParseFlags parses persistent flag tree and local flags.
func (c *Command) ParseFlags(args []string) error {
func (c *Command) ParseFlags(args []string) (err error) {
if c.DisableFlagParsing {
return nil
}
beforeErrorBufLen := c.flagErrorBuf.Len()
c.mergePersistentFlags()
err := c.Flags().Parse(args)
// Print warnings if they occurred (e.g. deprecated flag messages).
if c.flagErrorBuf.Len()-beforeErrorBufLen > 0 && err == nil {
c.Print(c.flagErrorBuf.String())
}
return err
err = c.Flags().Parse(args)
return
}
// Parent returns a commands parent command.