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

Merge pull request #5079 from openSUSE/error-image-size 

Wrap error for failing ImageSize calls
This commit is contained in:
OpenShift Merge Robot 2020-02-04 07:12:56 -08:00 committed by GitHub
parent 28eb296653 b8a2818e70
commit 537352cc3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libpod/image/image.go
View File

@ -709,11 +709,12 @@ func (i *Image) Size(ctx context.Context) (*uint64, error) {
} }
i.image = localImage i.image = localImage
} }
if sum, err := i.imageruntime.store.ImageSize(i.ID()); err == nil && sum >= 0 { sum, err := i.imageruntime.store.ImageSize(i.ID())
if err == nil && sum >= 0 {
usum := uint64(sum) usum := uint64(sum)
return &usum, nil return &usum, nil
} }
return nil, errors.Errorf("unable to determine size") return nil, errors.Wrap(err, "unable to determine size")
} }
// toImageRef returns an Image Reference type from an image // toImageRef returns an Image Reference type from an image