diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-10-17 18:44:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 18:44:56 -0400 |
| commit | d01382aed1429d5aa2dea77fb15569b03f45e9a1 (patch) | |
| tree | c2c4992606864554b346ebbfa7bddc5061bd3bcc /libpod/image/pull.go | |
| parent | 19c150bef12ff08abc8249cc21275266a7ac74a3 (diff) | |
| parent | bfc473f982ecdbfbe885d104036ecf9f70f3cd0f (diff) | |
| download | podman-d01382aed1429d5aa2dea77fb15569b03f45e9a1.tar.gz podman-d01382aed1429d5aa2dea77fb15569b03f45e9a1.tar.bz2 podman-d01382aed1429d5aa2dea77fb15569b03f45e9a1.zip | |
Merge pull request #1676 from baude/updatebuildah
Vendor in new new buildah/ci
Diffstat (limited to 'libpod/image/pull.go')
| -rw-r--r-- | libpod/image/pull.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/image/pull.go b/libpod/image/pull.go index 9eac2b988..bfa04d069 100644 --- a/libpod/image/pull.go +++ b/libpod/image/pull.go @@ -255,7 +255,8 @@ func (ir *Runtime) doPullImage(ctx context.Context, sc *types.SystemContext, goa if writer != nil && (imageInfo.srcRef.Transport().Name() == DockerTransport || imageInfo.srcRef.Transport().Name() == AtomicTransport) { io.WriteString(writer, fmt.Sprintf("Trying to pull %s...", imageInfo.image)) } - if err = cp.Image(ctx, policyContext, imageInfo.dstRef, imageInfo.srcRef, copyOptions); err != nil { + _, err = cp.Image(ctx, policyContext, imageInfo.dstRef, imageInfo.srcRef, copyOptions) + if err != nil { pullErrors = multierror.Append(pullErrors, err) logrus.Debugf("Error pulling image ref %s: %v", imageInfo.srcRef.StringWithinTransport(), err) if writer != nil { |