Skip to content

Commit

Permalink
Pass the same args to ValidateArgs as the Run methods receive.
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
  • Loading branch information
dnephin committed Sep 16, 2016
1 parent d41f5b5 commit 6d5851f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions command.go
Original file line number Diff line number Diff line change
Expand Up @@ -567,17 +567,17 @@ func (c *Command) execute(a []string) (err error) {
return flag.ErrHelp
}

if err := c.ValidateArgs(a); err != nil {
return err
}

c.preRun()

argWoFlags := c.Flags().Args()
if c.DisableFlagParsing {
argWoFlags = a
}

if err := c.ValidateArgs(argWoFlags); err != nil {
return err
}

for p := c; p != nil; p = p.Parent() {
if p.PersistentPreRunE != nil {
if err := p.PersistentPreRunE(c, argWoFlags); err != nil {
Expand Down Expand Up @@ -717,7 +717,7 @@ func (c *Command) ValidateArgs(args []string) error {
if c.Args == nil {
return nil
}
return c.Args(c, stripFlags(args, c))
return c.Args(c, args)
}

func (c *Command) initHelpFlag() {
Expand Down

0 comments on commit 6d5851f

Please sign in to comment.