diff --git a/cobra_test.go b/cobra_test.go index 66e44e4b..c26633ed 100644 --- a/cobra_test.go +++ b/cobra_test.go @@ -220,6 +220,7 @@ func fullSetupTest(input string) resulter { func noRRSetupTestSilenced(input string) resulter { c := initialize() c.SilenceErrors = true + c.SilenceUsage = true return fullTester(c, input) } diff --git a/command.go b/command.go index 9fdb1821..6d1f56e0 100644 --- a/command.go +++ b/command.go @@ -63,6 +63,8 @@ type Command struct { lflags *flag.FlagSet // SilenceErrors is an option to quiet errors down stream SilenceErrors bool + // Silence Usage is an option to silence usage when an error occurs. + SilenceUsage bool // The *Run functions are executed in the following order: // * PersistentPreRun() // * PreRun() @@ -638,12 +640,14 @@ func (c *Command) Execute() (err error) { err = cmd.execute(flags) if err != nil { // If root is silenced, all subcommands should have the same + if !cmd.SilenceUsage && !c.SilenceUsage { + c.Println(cmd.UsageString()) + } if !cmd.SilenceErrors && !c.SilenceErrors { if err == flag.ErrHelp { cmd.HelpFunc()(cmd, args) return nil } - c.Println(cmd.UsageString()) c.Println("Error:", err.Error()) } return err