mirror of
https://github.com/restic/restic.git
synced 2025-12-03 21:21:47 +00:00
Handle canceled context in restore --verify properly
This commit is contained in:
committed by
Michael Eischer
parent
d4225ec803
commit
d357744104
@@ -99,10 +99,13 @@ func (res *Restorer) traverseTree(ctx context.Context, target, location string,
|
||||
}
|
||||
|
||||
sanitizeError := func(err error) error {
|
||||
if err != nil {
|
||||
err = res.Error(nodeLocation, err)
|
||||
switch err {
|
||||
case nil, context.Canceled, context.DeadlineExceeded:
|
||||
// Context errors are permanent.
|
||||
return err
|
||||
default:
|
||||
return res.Error(nodeLocation, err)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
if node.Type == "dir" {
|
||||
@@ -364,7 +367,7 @@ func (res *Restorer) VerifyFiles(ctx context.Context, dst string) (int, error) {
|
||||
}
|
||||
atomic.AddUint64(&nchecked, 1)
|
||||
}
|
||||
return
|
||||
return err
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user