Skip to content
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

Fix stderr printing functions #894

Merged
merged 6 commits into from
Oct 1, 2020
Merged

Fix stderr printing functions #894

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
59bb8be
Fix stderr printing functions
alessio Jun 24, 2019
0da6ddb
Errors go to stderr as per POSIX
alessio Jun 26, 2019
d7b65d7
use PrintErrf() instead of extra call to Sprintf()
alessio Apr 12, 2020
bf23a83
Error messages should always be printed to os.Stderr.
alessio Apr 12, 2020
4950fa3
Merge remote-tracking branch 'upstream/master' into fix-stderr-redire…
Aug 17, 2020
b23cee0
add test case for Print* redirection
Sep 8, 2020
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
14 changes: 7 additions & 7 deletions command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ func (c *Command) UsageFunc() (f func(*Command) error) {
c.mergePersistentFlags()
err := tmpl(c.OutOrStderr(), c.UsageTemplate(), c)
if err != nil {
c.Println(err)
c.PrintErrln(err)
}
return err
}
Expand All @@ -374,7 +374,7 @@ func (c *Command) HelpFunc() func(*Command, []string) {
c.mergePersistentFlags()
err := tmpl(c.OutOrStderr(), c.HelpTemplate(), c)
if err != nil {
c.Println(err)
c.PrintErrln(err)
}
}
}
Expand Down Expand Up @@ -903,8 +903,8 @@ func (c *Command) ExecuteC() (cmd *Command, err error) {
c = cmd
}
if !c.SilenceErrors {
c.Println("Error:", err.Error())
c.Printf("Run '%v --help' for usage.\n", c.CommandPath())
c.PrintErrln("Error:", err.Error())
c.PrintErr(fmt.Sprintf("Run '%v --help' for usage.\n", c.CommandPath()))
alessio marked this conversation as resolved.
Show resolved Hide resolved
alessio marked this conversation as resolved.
Show resolved Hide resolved
}
return c, err
}
Expand Down Expand Up @@ -934,7 +934,7 @@ func (c *Command) ExecuteC() (cmd *Command, err error) {
// If root command has SilentErrors flagged,
// all subcommands should respect it
if !cmd.SilenceErrors && !c.SilenceErrors {
c.Println("Error:", err.Error())
c.PrintErrln("Error:", err.Error())
}

// If root command has SilentUsage flagged,
Expand Down Expand Up @@ -1150,12 +1150,12 @@ func (c *Command) PrintErr(i ...interface{}) {

// PrintErrln is a convenience method to Println to the defined Err output, fallback to Stderr if not set.
func (c *Command) PrintErrln(i ...interface{}) {
c.Print(fmt.Sprintln(i...))
c.PrintErr(fmt.Sprintln(i...))
}

// PrintErrf is a convenience method to Printf to the defined Err output, fallback to Stderr if not set.
func (c *Command) PrintErrf(format string, i ...interface{}) {
c.Print(fmt.Sprintf(format, i...))
c.PrintErr(fmt.Sprintf(format, i...))
}

// CommandPath returns the full path to this command.
Expand Down