erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-10-14 18:07:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #8875 from rhatdan/image

Browse source 
Allow image errors to bubble up from lower level functions.
This commit is contained in:
OpenShift Merge Robot 2021-01-04 17:30:22 -05:00 • committed by GitHub
commit ced7c0ab7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 "", nil, errors.Wrapf(ErrNoSuchImage, err.Error())
return "", nil, err
}
// 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 {
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