Merge pull request #2332 from dmcgowan/fix-missing-return-in-client-pull

crosbymichael · web-flow · commit a15e7a0be093 · 2018-05-08T09:24:43.000-04:00
Add missing return statement on pull unpack
diff --git a/client.go b/client.go
@@ -366,7 +366,7 @@ func (c *Client) Pull(ctx context.Context, ref string, opts ...RemoteOpt) (Image
 	}
 	if pullCtx.Unpack {
 		if err := img.Unpack(ctx, pullCtx.Snapshotter); err != nil {
-			errors.Wrapf(err, "failed to unpack image on snapshotter %s", pullCtx.Snapshotter)
+			return nil, errors.Wrapf(err, "failed to unpack image on snapshotter %s", pullCtx.Snapshotter)
 		}
 	}
 	return img, nil

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ func (c *Client) Pull(ctx context.Context, ref string, opts ...RemoteOpt) (Image`
`366`	`366`	`}`
`367`	`367`	`if pullCtx.Unpack {`
`368`	`368`	`if err := img.Unpack(ctx, pullCtx.Snapshotter); err != nil {`
`369`		`- errors.Wrapf(err, "failed to unpack image on snapshotter %s", pullCtx.Snapshotter)`
	`369`	`+ return nil, errors.Wrapf(err, "failed to unpack image on snapshotter %s", pullCtx.Snapshotter)`
`370`	`370`	`}`
`371`	`371`	`}`
`372`	`372`	`return img, nil`