opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-08 05:15:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

varlink ImageRemove should always return image ID

Browse Source 
When removing an image via varlink, we should always return the
ID of the image even in the case where the image has multiple
repository names and one was only untagged.

Reported by jhonce during integration testing.

Signed-off-by: baude <bbaude@redhat.com>

Closes: 
Approved by: jwhonce
This commit is contained in:
baude
2018-07-30 17:20:34 -05:00
committed by Atomic Bot
parent 00caebde61
commit 5b9c60cc10
1 changed files with 2 additions and 2 deletions

4
pkg/varlinkapi/images.go

@ -382,11 +382,11 @@ func (i *LibpodAPI) RemoveImage(call ioprojectatomicpodman.VarlinkCall, name str
if err != nil { if err != nil {
return call.ReplyImageNotFound(name) return call.ReplyImageNotFound(name)
} }
imageID, err := runtime.RemoveImage(ctx, newImage, force) _, err = runtime.RemoveImage(ctx, newImage, force)
if err != nil { if err != nil {
return call.ReplyErrorOccurred(err.Error()) return call.ReplyErrorOccurred(err.Error())
} }
return call.ReplyRemoveImage(imageID) return call.ReplyRemoveImage(newImage.ID())
} }
// SearchImage searches all registries configured in /etc/containers/registries.conf for an image // SearchImage searches all registries configured in /etc/containers/registries.conf for an image