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

Merge pull request #2011 from darrenstahlmsft/ResolveErrors

Browse Source 
Provide better error context on resolve failures
This commit is contained in:
Phil Estes 2018-01-17 16:42:40 -05:00 committed by GitHub
commit 80fc1f2d07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client.go
View File

@ -222,11 +222,11 @@ func (c *Client) Pull(ctx context.Context, ref string, opts ...RemoteOpt) (Image
name, desc, err := pullCtx.Resolver.Resolve(ctx, ref) name, desc, err := pullCtx.Resolver.Resolve(ctx, ref)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrapf(err, "failed to resolve reference %q", ref)
} }
fetcher, err := pullCtx.Resolver.Fetcher(ctx, name) fetcher, err := pullCtx.Resolver.Fetcher(ctx, name)
if err != nil { if err != nil {
return nil, err return nil, errors.Wrapf(err, "failed to get fetcher for %q", name)
} }
var ( var (
@ -281,7 +281,7 @@ func (c *Client) Pull(ctx context.Context, ref string, opts ...RemoteOpt) (Image
} }
if pullCtx.Unpack { if pullCtx.Unpack {
if err := img.Unpack(ctx, pullCtx.Snapshotter); err != nil { if err := img.Unpack(ctx, pullCtx.Snapshotter); err != nil {
return nil, err errors.Wrapf(err, "failed to unpack image on snapshotter %s", pullCtx.Snapshotter)
} }
} }
return img, nil return img, nil