From 0f9a2735b74dac1ae506da1d0ed389bd215a89db Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 18 Sep 2020 09:30:21 -0400 Subject: Fix podman image unmount to only report images unmounted Currently `podman image unmount` report every image that is mounted when it unmounts them. We should only report unmounted actually mounted images. Signed-off-by: Daniel J Walsh --- pkg/domain/infra/abi/images.go | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pkg/domain') diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index cc62c3f27..25c0c184f 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -191,6 +191,15 @@ func (ir *ImageEngine) Unmount(ctx context.Context, nameOrIDs []string, options reports := []*entities.ImageUnmountReport{} for _, img := range images { report := entities.ImageUnmountReport{Id: img.ID()} + mounted, _, err := img.Mounted() + if err != nil { + // Errors will be caught in Unmount call below + // Default assumption to mounted + mounted = true + } + if !mounted { + continue + } if err := img.Unmount(options.Force); err != nil { if options.All && errors.Cause(err) == storage.ErrLayerNotMounted { logrus.Debugf("Error umounting image %s, storage.ErrLayerNotMounted", img.ID()) -- cgit v1.2.3-54-g00ecf