2
2
mirror of https://github.com/octoleo/restic.git synced 2024-11-25 14:17:42 +00:00

Merge pull request #1400 from armhold/deadlock2

log unexpected errs from b2 ListCurrentObject()
This commit is contained in:
Alexander Neumann 2017-10-30 18:39:33 +01:00
commit d01d07fc0a

View File

@ -319,6 +319,8 @@ func (be *b2Backend) List(ctx context.Context, t restic.FileType) <-chan string
objs, c, err := be.bucket.ListCurrentObjects(ctx, be.listMaxItems, cur) objs, c, err := be.bucket.ListCurrentObjects(ctx, be.listMaxItems, cur)
be.sem.ReleaseToken() be.sem.ReleaseToken()
if err != nil && err != io.EOF { if err != nil && err != io.EOF {
// TODO: return err to caller once err handling in List() is improved
debug.Log("List: %v", err)
return return
} }
debug.Log("returned %v items", len(objs)) debug.Log("returned %v items", len(objs))