Merge pull request #4108 from MichaelEischer/cleanup-check-output

Cleanup check output
This commit is contained in:
Michael Eischer 2022-12-29 11:59:18 +01:00 committed by GitHub
commit 0fbff39ae8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions

View File

@ -245,7 +245,7 @@ func runCheck(ctx context.Context, opts CheckOptions, gopts GlobalOptions, args
} }
if suggestIndexRebuild { if suggestIndexRebuild {
Printf("This is non-critical, you can run `restic rebuild-index' to correct this\n") Printf("Duplicate packs/old indexes are non-critical, you can run `restic rebuild-index' to correct this.\n")
} }
if mixedFound { if mixedFound {
Printf("Mixed packs with tree and data blobs are non-critical, you can run `restic prune` to correct this.\n") Printf("Mixed packs with tree and data blobs are non-critical, you can run `restic prune` to correct this.\n")
@ -295,7 +295,11 @@ func runCheck(ctx context.Context, opts CheckOptions, gopts GlobalOptions, args
for err := range errChan { for err := range errChan {
errorsFound = true errorsFound = true
if e, ok := err.(*checker.TreeError); ok { 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 { for _, treeErr := range e.Errors {
Warnf(" %v\n", treeErr) Warnf(" %v\n", treeErr)
} }