diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-23 13:31:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-23 13:31:51 +0200 |
| commit | e25528633d1fbcc38f072c8443f0038a9c161cad (patch) | |
| tree | 00a6070dc7acea68e35ea04a5e170c3f113e462f /pkg | |
| parent | c71bbffc0f32b4539897249f0f3c1d1398d9f2b4 (diff) | |
| parent | e66346c7b03bdad8c460992b54cd675d19c64c72 (diff) | |
| download | podman-e25528633d1fbcc38f072c8443f0038a9c161cad.tar.gz podman-e25528633d1fbcc38f072c8443f0038a9c161cad.tar.bz2 podman-e25528633d1fbcc38f072c8443f0038a9c161cad.zip | |
Merge pull request #5952 from rhatdan/v
Stop wrapping pull messages
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/api/handlers/libpod/images.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/images.go | 6 |
2 files changed, 4 insertions, 4 deletions
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 } |