Merge pull request #5952 from rhatdan/v

Stop wrapping pull messages

3 files changed, 6 insertions, 6 deletions

diff --git a/libpod/image/pull.go b/libpod/image/pull.go
index fd359d593..6b4c40ba2 100644
--- a/libpod/image/pull.go
+++ b/libpod/image/pull.go
@@ -334,11 +334,11 @@ func (ir *Runtime) doPullImage(ctx context.Context, sc *types.SystemContext, goa
 		// If the image passed in was fully-qualified, we will have 1 refpair.  Bc the image is fq'd, we don't need to yap about registries.
 		if !goal.usedSearchRegistries {
 			if pullErrors != nil && len(pullErrors.Errors) > 0 { // this should always be true
-				return nil, errors.Wrap(pullErrors.Errors[0], "unable to pull image")
+				return nil, pullErrors.Errors[0]
 			}
 			return nil, errors.Errorf("unable to pull image, or you do not have pull access")
 		}
-		return nil, pullErrors
+		return nil, errors.Cause(pullErrors)
 	}
 	if len(images) > 0 {
 		ir.newImageEvent(events.Pull, images[0])
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go
index 46401e4f2..760ab1b7c 100644
--- a/pkg/api/handlers/libpod/images.go
+++ b/pkg/api/handlers/libpod/images.go
@@ -443,7 +443,7 @@ func ImagesPull(w http.ResponseWriter, r *http.Request) {
 			nil,
 			util.PullImageAlways)
 		if err != nil {
-			utils.InternalServerError(w, errors.Wrapf(err, "error pulling image %q", query.Reference))
+			utils.InternalServerError(w, err)
 			return
 		}
 		res = append(res, handlers.LibpodImagesPullReport{ID: newImage.ID()})
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index caed432f9..8a2771a4c 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -101,7 +101,7 @@ func (ir *ImageEngine) Pull(ctx context.Context, rawImage string, options entiti
 	if imageRef.Transport().Name() == dockerarchive.Transport.Name() {
 		newImage, err := ir.Libpod.ImageRuntime().LoadFromArchiveReference(ctx, imageRef, options.SignaturePolicy, writer)
 		if err != nil {
-			return nil, errors.Wrapf(err, "error pulling image %q", rawImage)
+			return nil, err
 		}
 		return &entities.ImagePullReport{Images: []string{newImage[0].ID()}}, nil
 	}
@@ -125,7 +125,7 @@ func (ir *ImageEngine) Pull(ctx context.Context, rawImage string, options entiti
 	if !options.AllTags {
 		newImage, err := ir.Libpod.ImageRuntime().New(ctx, rawImage, options.SignaturePolicy, options.Authfile, writer, &dockerRegistryOptions, image.SigningOptions{}, nil, util.PullImageAlways)
 		if err != nil {
-			return nil, errors.Wrapf(err, "error pulling image %q", rawImage)
+			return nil, err
 		}
 		return &entities.ImagePullReport{Images: []string{newImage.ID()}}, nil
 	}
@@ -166,7 +166,7 @@ func (ir *ImageEngine) Pull(ctx context.Context, rawImage string, options entiti
 	}
 
 	if len(tags) != len(foundIDs) {
-		return nil, errors.Errorf("error pulling image %q", rawImage)
+		return nil, err
 	}
 	return &entities.ImagePullReport{Images: foundIDs}, nil
 }