From 8430399fce2662f0ced9972f84a141508ede4f31 Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Wed, 28 Dec 2022 17:47:27 +0100 Subject: [PATCH] check: Partially fix garbled output When reporting an error for a tree, the output message can overlap with the progress bar output, e.g. `error for tree e91ef6fb:napshots`. The fix only applies for this specific message and does not work on Windows. --- cmd/restic/cmd_check.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/restic/cmd_check.go b/cmd/restic/cmd_check.go index 7fafe0ee9..be9dd5130 100644 --- a/cmd/restic/cmd_check.go +++ b/cmd/restic/cmd_check.go @@ -295,7 +295,11 @@ func runCheck(ctx context.Context, opts CheckOptions, gopts GlobalOptions, args for err := range errChan { errorsFound = true if e, ok := err.(*checker.TreeError); ok { - Warnf("error for tree %v:\n", e.ID.Str()) + var clean string + if stdoutCanUpdateStatus() { + clean = clearLine(0) + } + Warnf(clean+"error for tree %v:\n", e.ID.Str()) for _, treeErr := range e.Errors { Warnf(" %v\n", treeErr) }