diff options
author | Matthew Heon <mheon@redhat.com> | 2020-03-17 15:20:14 -0400 |
---|---|---|
committer | Matthew Heon <mheon@redhat.com> | 2020-03-17 15:20:14 -0400 |
commit | 83d2686f466e1ea439039c301fcdce53313d3af0 (patch) | |
tree | 6f825beb23cd1fc82519f1f77beb3d16b7a2f9fc /vendor | |
parent | 8f1ce4bddd54fe8067cca688430a7099c5f42cd1 (diff) | |
download | podman-83d2686f466e1ea439039c301fcdce53313d3af0.tar.gz podman-83d2686f466e1ea439039c301fcdce53313d3af0.tar.bz2 podman-83d2686f466e1ea439039c301fcdce53313d3af0.zip |
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 <mheon@redhat.com>
Diffstat (limited to 'vendor')
-rw-r--r-- | vendor/github.com/containers/buildah/pkg/supplemented/supplemented.go | 11 |
1 files changed, 9 insertions, 2 deletions
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) { |