summaryrefslogtreecommitdiff
path: root/pkg/domain/infra/abi
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2021-01-11 11:34:23 +0100
committerValentin Rothberg <rothberg@redhat.com>2021-01-11 19:15:33 +0100
commit1d7e5227f874dc3d2511a73a6f3d69550e62b303 (patch)
tree341367e1192f7b458dddec9da01b5f7938d0d780 /pkg/domain/infra/abi
parent41613bdb96953c9cea8a8fd46da211bd42660944 (diff)
downloadpodman-1d7e5227f874dc3d2511a73a6f3d69550e62b303.tar.gz
podman-1d7e5227f874dc3d2511a73a6f3d69550e62b303.tar.bz2
podman-1d7e5227f874dc3d2511a73a6f3d69550e62b303.zip
image list: ignore bare manifest list
Handle empty/bare manifest lists when listing images. Fixes: #8931 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'pkg/domain/infra/abi')
-rw-r--r--pkg/domain/infra/abi/images_list.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go
index c4b0b7712..2d3b9f36a 100644
--- a/pkg/domain/infra/abi/images_list.go
+++ b/pkg/domain/infra/abi/images_list.go
@@ -44,7 +44,10 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions)
}
e.Labels, err = img.Labels(ctx)
if err != nil {
- return nil, errors.Wrapf(err, "error retrieving label for image %q: you may need to remove the image to resolve the error", img.ID())
+ // Ignore empty manifest lists.
+ if errors.Cause(err) != libpodImage.ErrImageIsBareList {
+ return nil, errors.Wrapf(err, "error retrieving label for image %q: you may need to remove the image to resolve the error", img.ID())
+ }
}
ctnrs, err := img.Containers()