diff --git a/src/restic/backend/b2/b2.go b/src/restic/backend/b2/b2.go index 7bc3b8856..f83ba73b5 100644 --- a/src/restic/backend/b2/b2.go +++ b/src/restic/backend/b2/b2.go @@ -221,18 +221,13 @@ func (be *b2) List(t restic.FileType, done <-chan struct{}) <-chan string { return } for _, obj := range objs { - info, err := obj.Attrs(be.context) - if err != nil { - continue - } - // Skip objects returned that do not have the specified prefix. - if !strings.HasPrefix(info.Name, prefix) { + if !strings.HasPrefix(obj.Name(), prefix) { continue } // Remove the prefix from returned names. - m := strings.TrimPrefix(info.Name, prefix) + m := strings.TrimPrefix(obj.Name(), prefix) if m == "" { continue } diff --git a/vendor/manifest b/vendor/manifest index 51630c972..fb68fbcfe 100644 --- a/vendor/manifest +++ b/vendor/manifest @@ -34,7 +34,7 @@ { "importpath": "github.com/kurin/blazer", "repository": "https://github.com/kurin/blazer", - "revision": "b1c2abe264719d4d2062dbeb10d17d5de28d26ca", + "revision": "fff096e261374c464c633ef70b264f5e9651b091", "branch": "master" }, { diff --git a/vendor/src/github.com/kurin/blazer/b2/b2.go b/vendor/src/github.com/kurin/blazer/b2/b2.go index 57ba8b368..1a31146e5 100644 --- a/vendor/src/github.com/kurin/blazer/b2/b2.go +++ b/vendor/src/github.com/kurin/blazer/b2/b2.go @@ -155,6 +155,11 @@ type Attrs struct { Info map[string]string // Save arbitrary metadata on upload, but limited to 10 keys. } +// Name returns an object's name +func (o *Object) Name() string { + return o.name +} + // Attrs returns an object's attributes. func (o *Object) Attrs(ctx context.Context) (*Attrs, error) { if err := o.ensure(ctx); err != nil {