amorfo77/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2026-09-20 19:18:31 +00:00
Code Issues Projects Releases Wiki Activity

Replace fmt.Printf/Println/Fprintf with wrapper functions

Browse Source 
cmd/restic/globals.go already provides Printf, Println and Warnf wrapper
which get their output streams from the globalOptions object. This
allows for stream replacements when testing.
This commit is contained in:
Michael Eischer
2020-06-14 11:08:11 +02:00
parent 74bc7141c1
commit 182655bc88
6 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/restic/cmd_check.go
+5 -6
View File
@@ -3,7 +3,6 @@ package main
import (
"fmt"
"io/ioutil"
"os"
"strconv"
"strings"
"time"
@@ -235,7 +234,7 @@ func runCheck(opts CheckOptions, gopts GlobalOptions, args []string) error {
continue
}
errorsFound = true
fmt.Fprintf(os.Stderr, "%v\n", err)
Warnf("%v\n", err)
}
if orphanedPacks > 0 {
@@ -249,12 +248,12 @@ func runCheck(opts CheckOptions, gopts GlobalOptions, args []string) error {
for err := range errChan {
errorsFound = true
if e, ok := err.(checker.TreeError); ok {
fmt.Fprintf(os.Stderr, "error for tree %v:\n", e.ID.Str())
Warnf("error for tree %v:\n", e.ID.Str())
for _, treeErr := range e.Errors {
fmt.Fprintf(os.Stderr, " %v\n", treeErr)
Warnf(" %v\n", treeErr)
}
} else {
fmt.Fprintf(os.Stderr, "error: %v\n", err)
Warnf("error: %v\n", err)
}
}
@@ -289,7 +288,7 @@ func runCheck(opts CheckOptions, gopts GlobalOptions, args []string) error {
for err := range errChan {
errorsFound = true
fmt.Fprintf(os.Stderr, "%v\n", err)
Warnf("%v\n", err)
}
}