mirror of
https://github.com/spf13/cobra
synced 2024-11-24 14:47:12 +00:00
Parsing persistentFlags properly (mostly)
This commit is contained in:
parent
ce6447a965
commit
36e08ffd5b
1 changed files with 13 additions and 9 deletions
10
cobra.go
10
cobra.go
|
@ -136,7 +136,7 @@ func (c *Command) execute(args []string) (err error) {
|
|||
|
||||
cmd, a, e := c.Find(args)
|
||||
if e == nil {
|
||||
cmd.Flags().Parse(a)
|
||||
err = cmd.ParseFlags(a)
|
||||
argWoFlags := cmd.Flags().Args()
|
||||
cmd.Run(cmd, argWoFlags)
|
||||
return nil
|
||||
|
@ -296,16 +296,20 @@ func (c *Command) ParseFlags(args []string) (err error) {
|
|||
|
||||
// Climbs up the command tree parsing flags from top to bottom
|
||||
func (c *Command) ParsePersistentFlags(args []string) (err error) {
|
||||
if !c.HasParent() || c.parent.PersistentFlags().Parsed() {
|
||||
if !c.HasParent() || (c.parent.HasPersistentFlags() && c.parent.PersistentFlags().Parsed()) {
|
||||
if c.HasPersistentFlags() {
|
||||
err = c.PersistentFlags().Parse(args)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if c.HasParent() && c.parent.HasPersistentFlags() {
|
||||
err = c.parent.ParsePersistentFlags(args)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
return
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue