From 83d2686f466e1ea439039c301fcdce53313d3af0 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Tue, 17 Mar 2020 15:20:14 -0400 Subject: Fix vendoring on master It looks like something snuck in and now make vendor fails on master. This should make things happy. Signed-off-by: Matthew Heon --- .../containers/buildah/pkg/supplemented/supplemented.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'vendor/github.com') diff --git a/vendor/github.com/containers/buildah/pkg/supplemented/supplemented.go b/vendor/github.com/containers/buildah/pkg/supplemented/supplemented.go index 9dd47a0e2..5e3c6291a 100644 --- a/vendor/github.com/containers/buildah/pkg/supplemented/supplemented.go +++ b/vendor/github.com/containers/buildah/pkg/supplemented/supplemented.go @@ -296,6 +296,9 @@ func (s *supplementedImageSource) Close() error { } closed[sourceInstance] = struct{}{} } + if returnErr == nil { + return nil + } return returnErr.ErrorOrNil() } @@ -340,13 +343,17 @@ func (s *supplementedImageSource) HasThreadSafeGetBlob() bool { } func (s *supplementedImageSource) GetSignatures(ctx context.Context, instanceDigest *digest.Digest) ([][]byte, error) { - var src types.ImageSource + var ( + src types.ImageSource + digest digest.Digest + ) requestInstanceDigest := instanceDigest if instanceDigest == nil { if sourceInstance, ok := s.sourceInstancesByInstance[""]; ok { src = sourceInstance } } else { + digest = *instanceDigest if sourceInstance, ok := s.sourceInstancesByInstance[*instanceDigest]; ok { src = sourceInstance } @@ -357,7 +364,7 @@ func (s *supplementedImageSource) GetSignatures(ctx context.Context, instanceDig if src != nil { return src.GetSignatures(ctx, requestInstanceDigest) } - return nil, errors.Wrapf(ErrDigestNotFound, "error finding instance for instance digest %q to read signatures", *instanceDigest) + return nil, errors.Wrapf(ErrDigestNotFound, "error finding instance for instance digest %q to read signatures", digest) } func (s *supplementedImageSource) LayerInfosForCopy(ctx context.Context, instanceDigest *digest.Digest) ([]types.BlobInfo, error) { -- cgit v1.2.3-54-g00ecf