Skip to content

Fix a bug where errors were masked. #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brendandburns wants to merge 1 commit into from
Closed

Fix a bug where errors were masked. #94

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ import (
"time"
)

type UnknownCommandError struct {
commandStr string
}

func (u *UnknownCommandError) Error() string {
return fmt.Sprintf("unknown command %q\nRun 'help' for usage.\n", u.commandStr)
}

// Command is just that, a command for your application.
// eg. 'go run' ... 'run' is the command. Cobra requires
// you to define the usage and description as part of your command
Expand Down Expand Up @@ -386,7 +394,7 @@ func (c *Command) Find(arrs []string) (*Command, []string, error) {

// If we matched on the root, but we asked for a subcommand, return an error
if commandFound.Name() == c.Name() && len(stripFlags(arrs, c)) > 0 && commandFound.Name() != arrs[0] {
return nil, a, fmt.Errorf("unknown command %q", a[0])
return nil, a, &UnknownCommandError{a[0]}
}

return commandFound, a, nil
Expand Down Expand Up @@ -500,7 +508,20 @@ func (c *Command) Execute() (err error) {
c.Help()
}
} else {
<<<<<<< HEAD
cmd, flags, e := c.Find(args)
=======
err = c.findAndExecute(args)
}

_, isNotFound := err.(*UnknownCommandError)

// Now handle the case where the root is runnable and only flags are provided
if err != nil && isNotFound && c.Runnable() {
// This is pretty much a custom version of the *Command.execute method
// with a few differences because it's the final command (no fall back)
e := c.ParseFlags(args)
>>>>>>> Fix a bug where errors were masked.
if e != nil {
err = e
} else {
Expand Down