opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-01 00:01:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix vendoring on master

Browse Source 
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>
This commit is contained in:
Matthew Heon
2020-03-17 15:20:14 -04:00
parent 8f1ce4bddd
commit 83d2686f46
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vendor/github.com/containers/buildah/pkg/supplemented/supplemented.go generated vendored
View File

@ -296,6 +296,9 @@ func (s *supplementedImageSource) Close() error {
} }
closed[sourceInstance] = struct{}{} closed[sourceInstance] = struct{}{}
} }
if returnErr == nil {
return nil
}
return returnErr.ErrorOrNil() return returnErr.ErrorOrNil()
} }
@ -340,13 +343,17 @@ func (s *supplementedImageSource) HasThreadSafeGetBlob() bool {
} }
func (s *supplementedImageSource) GetSignatures(ctx context.Context, instanceDigest *digest.Digest) ([][]byte, error) { 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 requestInstanceDigest := instanceDigest
if instanceDigest == nil { if instanceDigest == nil {
if sourceInstance, ok := s.sourceInstancesByInstance[""]; ok { if sourceInstance, ok := s.sourceInstancesByInstance[""]; ok {
src = sourceInstance src = sourceInstance
} }
} else { } else {
digest = *instanceDigest
if sourceInstance, ok := s.sourceInstancesByInstance[*instanceDigest]; ok { if sourceInstance, ok := s.sourceInstancesByInstance[*instanceDigest]; ok {
src = sourceInstance src = sourceInstance
} }
@ -357,7 +364,7 @@ func (s *supplementedImageSource) GetSignatures(ctx context.Context, instanceDig
if src != nil { if src != nil {
return src.GetSignatures(ctx, requestInstanceDigest) 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) { func (s *supplementedImageSource) LayerInfosForCopy(ctx context.Context, instanceDigest *digest.Digest) ([]types.BlobInfo, error) {