From 7aa2f8a61ebbf07570c4528cd236ea13e5cf3fc5 Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Sat, 4 Apr 2020 00:00:21 +0200 Subject: [PATCH] debug: get stdout/stderr from gopts/globalOptions --- cmd/restic/cmd_debug.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/cmd/restic/cmd_debug.go b/cmd/restic/cmd_debug.go index 59e6ba07d..12c44dd19 100644 --- a/cmd/restic/cmd_debug.go +++ b/cmd/restic/cmd_debug.go @@ -7,7 +7,6 @@ import ( "encoding/json" "fmt" "io" - "os" "github.com/spf13/cobra" @@ -90,7 +89,7 @@ func printPacks(repo *repository.Repository, wr io.Writer) error { blobs, err := pack.List(repo.Key(), restic.ReaderAt(repo.Backend(), h), size) if err != nil { - fmt.Fprintf(os.Stderr, "error for pack %v: %v\n", id.Str(), err) + fmt.Fprintf(globalOptions.stderr, "error for pack %v: %v\n", id.Str(), err) return nil } @@ -151,20 +150,20 @@ func runDebugDump(gopts GlobalOptions, args []string) error { switch tpe { case "indexes": - return dumpIndexes(repo, os.Stdout) + return dumpIndexes(repo, gopts.stdout) case "snapshots": - return debugPrintSnapshots(repo, os.Stdout) + return debugPrintSnapshots(repo, gopts.stdout) case "packs": - return printPacks(repo, os.Stdout) + return printPacks(repo, gopts.stdout) case "all": fmt.Printf("snapshots:\n") - err := debugPrintSnapshots(repo, os.Stdout) + err := debugPrintSnapshots(repo, gopts.stdout) if err != nil { return err } fmt.Printf("\nindexes:\n") - err = dumpIndexes(repo, os.Stdout) + err = dumpIndexes(repo, gopts.stdout) if err != nil { return err }