KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Merge pull request #1828 from restic/handle-s3-list-errors

Browse source 
s3: Pass list errors up to the caller
This commit is contained in:
Alexander Neumann 2018-06-02 10:34:49 +02:00
commit cfc19b4582
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/backend/s3/s3.go
View file

@ -188,6 +188,10 @@ func (be *Backend) ReadDir(dir string) (list []os.FileInfo, err error) {
defer close(done) defer close(done)
for obj := range be.client.ListObjects(be.cfg.Bucket, dir, false, done) { for obj := range be.client.ListObjects(be.cfg.Bucket, dir, false, done) {
if obj.Err != nil {
return nil, err
}
if obj.Key == "" { if obj.Key == "" {
continue continue
} }
@ -424,6 +428,10 @@ func (be *Backend) List(ctx context.Context, t restic.FileType, fn func(restic.F
listresp := be.client.ListObjects(be.cfg.Bucket, prefix, recursive, ctx.Done()) listresp := be.client.ListObjects(be.cfg.Bucket, prefix, recursive, ctx.Done())
for obj := range listresp { for obj := range listresp {
if obj.Err != nil {
return obj.Err
}
m := strings.TrimPrefix(obj.Key, prefix) m := strings.TrimPrefix(obj.Key, prefix)
if m == "" { if m == "" {
continue continue