aboutsummaryrefslogtreecommitdiffstats
path: root/internal
diff options
context:
space:
mode:
authorEugene Triguba <eugenetriguba@gmail.com>2024-02-25 15:49:31 -0500
committerEugene Triguba <eugenetriguba@gmail.com>2024-02-25 15:49:31 -0500
commit29b5f58de7a5f027ea70932bf3c6d4a02de3ffdd (patch)
tree3a8df512d838d86f9b6e6ca2c7597ece574e57db /internal
parentChange Error in console outputter to accept error (diff)
downloadcli-29b5f58de7a5f027ea70932bf3c6d4a02de3ffdd.zip
fix merge conflict
Diffstat (limited to 'internal')
-rw-r--r--internal/output/console.go14
1 files changed, 4 insertions, 10 deletions
diff --git a/internal/output/console.go b/internal/output/console.go
index 42b0e3f..1a4efad 100644
--- a/internal/output/console.go
+++ b/internal/output/console.go
@@ -24,19 +24,13 @@ func (c ConsoleOutputter) Output(message string) error {
return nil
}
-<<<<<<< Updated upstream
-func (c ConsoleOutputter) Error(message string) error {
- _, err := fmt.Fprintln(c.stderr, message)
- if err != nil {
- return fmt.Errorf("unable to print message %s: %w", message, err)
- }
- return nil
-=======
func (c ConsoleOutputter) Error(err error) error {
msg := err.Error()
_, printErr := fmt.Fprintln(c.stderr, msg)
- return fmt.Errorf("unable to print message %s: %w", msg, printErr)
->>>>>>> Stashed changes
+ if printErr != nil {
+ return fmt.Errorf("unable to print message %s: %w", msg, printErr)
+ }
+ return nil
}
func (c ConsoleOutputter) Table(headers []string, rows [][]string) error {