diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-09 15:11:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-09 15:11:49 +0100 |
| commit | 09473d43001f5818dbb178cba81f2f61e3de1457 (patch) | |
| tree | 54d3388e9270ca0571d9c038d3e0f73e43ba6e34 /libpod | |
| parent | 66ac9426ecebe43c98684ce4231c36721ff87d3a (diff) | |
| parent | 930bec4d3a7cfe83784ded58e5f8f88d062dd3e2 (diff) | |
| download | podman-09473d43001f5818dbb178cba81f2f61e3de1457.tar.gz podman-09473d43001f5818dbb178cba81f2f61e3de1457.tar.bz2 podman-09473d43001f5818dbb178cba81f2f61e3de1457.zip | |
Merge pull request #9677 from vrothberg/fix-9672
podman load: fix error handling
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/runtime_img.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index abefca788..90b11f8ca 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -316,7 +316,8 @@ func (r *Runtime) LoadImageFromSingleImageArchive(ctx context.Context, writer io } { src, err := referenceFn() if err == nil && src != nil { - if newImages, err := r.ImageRuntime().LoadFromArchiveReference(ctx, src, signaturePolicy, writer); err == nil { + newImages, err := r.ImageRuntime().LoadFromArchiveReference(ctx, src, signaturePolicy, writer) + if err == nil { return getImageNames(newImages), nil } saveErr = err |