diff options
author | Valentin Rothberg <rothberg@redhat.com> | 2020-06-24 14:44:42 +0200 |
---|---|---|
committer | Valentin Rothberg <rothberg@redhat.com> | 2020-06-24 15:34:46 +0200 |
commit | 1c6c12581ce0f2257a862e3a6a8dbaa7d0f32686 (patch) | |
tree | 391f714100dd231325c7c27d741c3de2ecb06e48 /libpod/image/image.go | |
parent | 0d26b8f24babcd847a7412907e622514925544a4 (diff) | |
download | podman-1c6c12581ce0f2257a862e3a6a8dbaa7d0f32686.tar.gz podman-1c6c12581ce0f2257a862e3a6a8dbaa7d0f32686.tar.bz2 podman-1c6c12581ce0f2257a862e3a6a8dbaa7d0f32686.zip |
podman untag: error if tag doesn't exist
Throw an error if a specified tag does not exist. Also make sure that
the user input is normalized as we already do for `podman tag`.
To prevent regressions, add a set of end-to-end and systemd tests.
Last but not least, update the docs and add bash completions.
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'libpod/image/image.go')
-rw-r--r-- | libpod/image/image.go | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libpod/image/image.go b/libpod/image/image.go index d81f7e911..83e7467e9 100644 --- a/libpod/image/image.go +++ b/libpod/image/image.go @@ -559,15 +559,24 @@ func (i *Image) TagImage(tag string) error { return nil } -// UntagImage removes a tag from the given image +// UntagImage removes the specified tag from the image. +// If the tag does not exist, ErrNoSuchTag is returned. func (i *Image) UntagImage(tag string) error { if err := i.reloadImage(); err != nil { return err } + + // Normalize the tag as we do with TagImage. + ref, err := NormalizedTag(tag) + if err != nil { + return err + } + tag = ref.String() + var newTags []string tags := i.Names() if !util.StringInSlice(tag, tags) { - return nil + return errors.Wrapf(ErrNoSuchTag, "%q", tag) } for _, t := range tags { if tag != t { |