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

Ensure the usage command is printed only once

Browse source 
Reverse a swap in logic introduced in #169 that would cause the usage
output to be printed twice.

Fixes #171
This commit is contained in:
James Bowes 2015-10-31 10:22:19 -03:00
parent 24562666ea
commit 871b0edae2
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cobra_test.go
View file

@ -1075,3 +1075,14 @@ func TestAddTemplateFunctions(t *testing.T) {
t.Errorf("c.UsageString() != \"%s\", is \"%s\"", usage, us) t.Errorf("c.UsageString() != \"%s\", is \"%s\"", usage, us)
} }
} }
func TestUsageIsNotPrintedTwice(t *testing.T) {
var cmd = &Command{Use: "root"}
var sub = &Command{Use: "sub"}
cmd.AddCommand(sub)
r := simpleTester(cmd, "")
if strings.Count(r.Output, "Usage:") != 1 {
t.Error("Usage output is not printed exactly once")
}
}

11
command.go
View file

@ -639,11 +639,6 @@ func (c *Command) Execute() (err error) {
err = cmd.execute(flags) err = cmd.execute(flags)
if err != nil { if err != nil {
// If root command has SilentUsage flagged,
// all subcommands should respect it
if !cmd.SilenceUsage && !c.SilenceUsage {
c.Println(cmd.UsageString())
}
// If root command has SilentErrors flagged, // If root command has SilentErrors flagged,
// all subcommands should respect it // all subcommands should respect it
if !cmd.SilenceErrors && !c.SilenceErrors { if !cmd.SilenceErrors && !c.SilenceErrors {
@ -653,6 +648,12 @@ func (c *Command) Execute() (err error) {
} }
c.Println("Error:", err.Error()) c.Println("Error:", err.Error())
} }
// If root command has SilentUsage flagged,
// all subcommands should respect it
if !cmd.SilenceUsage && !c.SilenceUsage {
c.Println(cmd.UsageString())
}
return err return err
} }
return return