github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1858 from jessvalarezo/images-errors

Browse Source 
update image error messages
This commit is contained in:
Stephen Day 2017-12-01 14:58:12 -08:00 committed by GitHub
commit 271836a417
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
images/image.go
View File

@ -187,13 +187,13 @@ func Manifest(ctx context.Context, provider content.Provider, image ocispec.Desc
return descs, nil return descs, nil
} }
return nil, errors.Wrap(errdefs.ErrNotFound, "could not resolve manifest") return nil, errors.Wrapf(errdefs.ErrNotFound, "could not resolve manifest %v", desc.Digest)
}), image); err != nil { }), image); err != nil {
return ocispec.Manifest{}, err return ocispec.Manifest{}, err
} }
if m == nil { if m == nil {
return ocispec.Manifest{}, errors.Wrap(errdefs.ErrNotFound, "manifest not found") return ocispec.Manifest{}, errors.Wrapf(errdefs.ErrNotFound, "manifest %v", image.Digest)
} }
return *m, nil return *m, nil
@ -257,7 +257,7 @@ func Check(ctx context.Context, provider content.Provider, image ocispec.Descrip
return false, []ocispec.Descriptor{image}, nil, []ocispec.Descriptor{image}, nil return false, []ocispec.Descriptor{image}, nil, []ocispec.Descriptor{image}, nil
} }
return false, nil, nil, nil, errors.Wrap(err, "image check failed") return false, nil, nil, nil, errors.Wrapf(err, "failed to check image %v", image.Digest)
} }
// TODO(stevvooe): It is possible that referenced conponents could have // TODO(stevvooe): It is possible that referenced conponents could have
@ -272,7 +272,7 @@ func Check(ctx context.Context, provider content.Provider, image ocispec.Descrip
missing = append(missing, desc) missing = append(missing, desc)
continue continue
} else { } else {
return false, nil, nil, nil, err return false, nil, nil, nil, errors.Wrapf(err, "failed to check image %v", desc.Digest)
} }
} }
ra.Close() ra.Close()