summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-03-04 10:16:23 -0500
committerGitHub <noreply@github.com>2021-03-04 10:16:23 -0500
commite4cf1d40d7e83853d2248ce8dd0b1cbb4b18b0da (patch)
treeaa422d2465d1888e33ce3c04743ca0a69b588b69
parent87a78c059dc2fb72ba54805d5488f3e619ae46f1 (diff)
parente43385eca285ba27a3a73a3cc63f470f895053cc (diff)
downloadpodman-e4cf1d40d7e83853d2248ce8dd0b1cbb4b18b0da.tar.gz
podman-e4cf1d40d7e83853d2248ce8dd0b1cbb4b18b0da.tar.bz2
podman-e4cf1d40d7e83853d2248ce8dd0b1cbb4b18b0da.zip
Merge pull request #9617 from vrothberg/fix-9588
image removal: ignore unknown-layer errors
-rw-r--r--pkg/domain/infra/abi/images.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index 562653403..ffd4856fe 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -583,8 +583,9 @@ func (ir *ImageEngine) Remove(ctx context.Context, images []string, opts entitie
report.Deleted = append(report.Deleted, results.Deleted)
report.Untagged = append(report.Untagged, results.Untagged...)
return nil
- case storage.ErrImageUnknown:
- // The image must have been removed already (see #6510).
+ case storage.ErrImageUnknown, storage.ErrLayerUnknown:
+ // The image must have been removed already (see #6510)
+ // or the storage is corrupted (see #9617).
report.Deleted = append(report.Deleted, img.ID())
report.Untagged = append(report.Untagged, img.ID())
return nil