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

Modify Runtime.getImage to return a storage.Image

Browse Source 
... because both callers only care about that aspect of the
return value.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač
2020-02-07 02:37:36 +01:00
parent 5b5bacbd95
commit dafd212870
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libpod/image/image.go
View File

@ -218,7 +218,7 @@ func (i *Image) reloadImage() error {
if err != nil {
return errors.Wrapf(err, "unable to reload image")
}
i.image = newImage.image
i.image = newImage
return nil
}
@ -245,7 +245,7 @@ func (ir *Runtime) getLocalImage(inputName string) (string, *storage.Image, erro
img, err := ir.getImage(stripSha256(inputName))
if err == nil {
return inputName, img.image, err
return inputName, img, err
}
// container-storage wasn't able to find it in its current form
@ -269,7 +269,7 @@ func (ir *Runtime) getLocalImage(inputName string) (string, *storage.Image, erro
}
img, err = ir.getImage(ref.String())
if err == nil {
return inputName, img.image, err
return inputName, img, err
}
// grab all the local images
@ -444,7 +444,7 @@ func (i *Image) Remove(ctx context.Context, force bool) error {
// getImage retrieves an image matching the given name or hash from system
// storage
// If no matching image can be found, an error is returned
func (ir *Runtime) getImage(image string) (*Image, error) {
func (ir *Runtime) getImage(image string) (*storage.Image, error) {
var img *storage.Image
ref, err := is.Transport.ParseStoreReference(ir.store, image)
if err == nil {
@ -460,8 +460,7 @@ func (ir *Runtime) getImage(image string) (*Image, error) {
}
img = img2
}
newImage := ir.newFromStorage(img)
return newImage, nil
return img, nil
}
// GetImages retrieves all images present in storage