From f95835d613ce45e50822b54be330514ecd900dac Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Thu, 3 May 2018 14:46:20 +0100 Subject: [PATCH] fserrors: Look deeper into errors for Fatal/Retry/NoRetry errors. Before this change fatal errors which were wrapped in a system error (eg a URLError) were not recognised as fatal errors. --- fs/fserrors/error.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/fserrors/error.go b/fs/fserrors/error.go index e9ebbcb0e..556ccb398 100644 --- a/fs/fserrors/error.go +++ b/fs/fserrors/error.go @@ -69,7 +69,7 @@ func IsRetryError(err error) bool { if err == nil { return false } - err = errors.Cause(err) + _, err = Cause(err) if r, ok := err.(Retrier); ok { return r.Retry() } @@ -114,7 +114,7 @@ func IsFatalError(err error) bool { if err == nil { return false } - err = errors.Cause(err) + _, err = Cause(err) if r, ok := err.(Fataler); ok { return r.Fatal() } @@ -159,7 +159,7 @@ func IsNoRetryError(err error) bool { if err == nil { return false } - err = errors.Cause(err) + _, err = Cause(err) if r, ok := err.(NoRetrier); ok { return r.NoRetry() }