docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update cobra to 75205f23b3ea70dc7ae5e900d074e010c23c37e9 

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2016-06-06 13:58:18 +02:00
parent 07a7c0632f
commit ca01e57d55
No known key found for this signature in database
GPG Key ID: 083CC6FD6EB699A3
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/vendor.sh
View File

@ -139,7 +139,7 @@ clone git github.com/docker/docker-credential-helpers v0.3.0
clone git github.com/docker/containerd 57b7c3da915ebe943bd304c00890959b191e5264 clone git github.com/docker/containerd 57b7c3da915ebe943bd304c00890959b191e5264
# cli # cli
clone git github.com/spf13/cobra acf60156558542e78c6f3695f74b0f871614ff55 https://github.com/dnephin/cobra.git clone git github.com/spf13/cobra 75205f23b3ea70dc7ae5e900d074e010c23c37e9 https://github.com/dnephin/cobra.git
clone git github.com/spf13/pflag cb88ea77998c3f024757528e3305022ab50b43be clone git github.com/spf13/pflag cb88ea77998c3f024757528e3305022ab50b43be
clone git github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 clone git github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75

20
vendor/src/github.com/spf13/cobra/command.go vendored
View File

@ -123,6 +123,9 @@ type Command struct {
DisableSuggestions bool DisableSuggestions bool
// If displaying suggestions, allows to set the minimum levenshtein distance to display, must be > 0 // If displaying suggestions, allows to set the minimum levenshtein distance to display, must be > 0
SuggestionsMinimumDistance int SuggestionsMinimumDistance int
// Disable the flag parsing. If this is true all flags will be passed to the command as arguments.
DisableFlagParsing bool
} }
// os.Args[1:] by default, if desired, can be overridden // os.Args[1:] by default, if desired, can be overridden
@ -556,12 +559,16 @@ func (c *Command) execute(a []string) (err error) {
return flag.ErrHelp return flag.ErrHelp
} }
if err := c.ValidateArgs(a); err != nil { c.preRun()
return err
argWoFlags := c.Flags().Args()
if c.DisableFlagParsing {
argWoFlags = a
} }
c.preRun() if err := c.ValidateArgs(argWoFlags); err != nil {
argWoFlags := c.Flags().Args() return err
}
for p := c; p != nil; p = p.Parent() { for p := c; p != nil; p = p.Parent() {
if p.PersistentPreRunE != nil { if p.PersistentPreRunE != nil {
@ -702,7 +709,7 @@ func (c *Command) ValidateArgs(args []string) error {
if c.Args == nil { if c.Args == nil {
return nil return nil
} }
return c.Args(c, stripFlags(args, c)) return c.Args(c, args)
} }
func (c *Command) initHelpFlag() { func (c *Command) initHelpFlag() {
@ -1200,6 +1207,9 @@ func (c *Command) persistentFlag(name string) (flag *flag.Flag) {
// ParseFlags parses persistent flag tree & local flags // ParseFlags parses persistent flag tree & local flags
func (c *Command) ParseFlags(args []string) (err error) { func (c *Command) ParseFlags(args []string) (err error) {
if c.DisableFlagParsing {
return nil
}
c.mergePersistentFlags() c.mergePersistentFlags()
err = c.Flags().Parse(args) err = c.Flags().Parse(args)
return return