containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow image errors to bubble up from lower level functions. 

Currently we ignore ErrMultipleImages being returned from findImageInRepoTags.

Fixes: https://github.com/containers/podman/issues/8868

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2021-01-04 10:49:52 -05:00
parent f261bfc549
commit d0093026a2
No known key found for this signature in database
GPG Key ID: A2DF901DABE2C028
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/image/image.go
View File

@ -497,7 +497,7 @@ func (ir *Runtime) getLocalImage(inputName string) (string, *storage.Image, erro
return inputName, repoImage, nil return inputName, repoImage, nil
} }
return "", nil, errors.Wrapf(ErrNoSuchImage, err.Error()) return "", nil, err
} }
// ID returns the image ID as a string // ID returns the image ID as a string

3
libpod/image/utils.go
View File

@ -45,7 +45,8 @@ func findImageInRepotags(search imageParts, images []*Image) (*storage.Image, er
} }
} }
if len(candidates) == 0 { if len(candidates) == 0 {
return nil, errors.Errorf("unable to find a name and tag match for %s in repotags", searchName)
return nil, errors.Wrapf(define.ErrNoSuchImage, "unable to find a name and tag match for %s in repotags", searchName)
} }
// If more then one candidate and the candidates all have same name // If more then one candidate and the candidates all have same name