glenux-archive/spf13--cobra
1
0
Fork 0
mirror of https://github.com/spf13/cobra synced 2024-11-16 10:47:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Subcommands flag parsing errors print subcommand usage and not root's command usage

Browse source
This commit is contained in:
Maciej Szulik 2014-12-09 14:42:53 +01:00 committed by spf13
parent b825817fc0
commit 033c83bc5e
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
command.go
View file

@ -57,6 +57,7 @@ type Command struct {
commandsMaxCommandPathLen int commandsMaxCommandPathLen int
flagErrorBuf *bytes.Buffer flagErrorBuf *bytes.Buffer
cmdErrorBuf *bytes.Buffer
args []string args []string
output *io.Writer // nil means stderr; use Out() method instead output *io.Writer // nil means stderr; use Out() method instead
@ -355,6 +356,15 @@ func (c *Command) execute(a []string) (err error) {
err = c.ParseFlags(a) err = c.ParseFlags(a)
if err != nil { if err != nil {
// We're writing subcommand usage to root command's error buffer to have it displayed to the user
if c.Root().cmdErrorBuf == nil {
c.Root().cmdErrorBuf = new(bytes.Buffer)
}
// for writing the usage to the buffer we need to switch the output temporarily
out := c.Out()
c.SetOutput(c.Root().cmdErrorBuf)
c.Usage()
c.SetOutput(out)
return err return err
} else { } else {
// If help is called, regardless of other flags, we print that // If help is called, regardless of other flags, we print that
@ -430,7 +440,12 @@ func (c *Command) Execute() (err error) {
// Flags parsing had an error. // Flags parsing had an error.
// If an error happens here, we have to report it to the user // If an error happens here, we have to report it to the user
c.Println(c.errorMsgFromParse()) c.Println(c.errorMsgFromParse())
// If an error happens search also for subcommand info about that
if c.cmdErrorBuf != nil && c.cmdErrorBuf.Len() > 0 {
c.Println(c.cmdErrorBuf.String())
} else {
c.Usage() c.Usage()
}
return e return e
} else { } else {
// If help is called, regardless of other flags, we print that // If help is called, regardless of other flags, we print that