diff options
author | Valentin Rothberg <rothberg@redhat.com> | 2019-09-30 14:20:17 +0200 |
---|---|---|
committer | Valentin Rothberg <rothberg@redhat.com> | 2019-09-30 14:20:17 +0200 |
commit | ee2b61bffa324f163a1c5eaf0f8d9a4d09047113 (patch) | |
tree | 76e9d12ad3305306171d5ea1aebc6a7c08802097 /vendor/github.com | |
parent | 01b7af8ee9b3df1439c4da109ba11e7410108dab (diff) | |
download | podman-ee2b61bffa324f163a1c5eaf0f8d9a4d09047113.tar.gz podman-ee2b61bffa324f163a1c5eaf0f8d9a4d09047113.tar.bz2 podman-ee2b61bffa324f163a1c5eaf0f8d9a4d09047113.zip |
update c/storage to v1.13.4
* Update generated files
* ImageBigData: distinguish between no-such-image and no-such-item
* ImageSize: don't get tripped up by images with no layers
* tarlogger: disable raw accouting
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'vendor/github.com')
4 files changed, 13 insertions, 5 deletions
diff --git a/vendor/github.com/containers/storage/VERSION b/vendor/github.com/containers/storage/VERSION index 01b756823..80138e714 100644 --- a/vendor/github.com/containers/storage/VERSION +++ b/vendor/github.com/containers/storage/VERSION @@ -1 +1 @@ -1.13.3 +1.13.4 diff --git a/vendor/github.com/containers/storage/images_ffjson.go b/vendor/github.com/containers/storage/images_ffjson.go index 6b40ebd59..539acfe93 100644 --- a/vendor/github.com/containers/storage/images_ffjson.go +++ b/vendor/github.com/containers/storage/images_ffjson.go @@ -1,5 +1,5 @@ // Code generated by ffjson <https://github.com/pquerna/ffjson>. DO NOT EDIT. -// source: images.go +// source: ./images.go package storage diff --git a/vendor/github.com/containers/storage/pkg/tarlog/tarlogger.go b/vendor/github.com/containers/storage/pkg/tarlog/tarlogger.go index 98d3ee96a..c6985d757 100644 --- a/vendor/github.com/containers/storage/pkg/tarlog/tarlogger.go +++ b/vendor/github.com/containers/storage/pkg/tarlog/tarlogger.go @@ -26,7 +26,6 @@ func NewLogger(logger func(*tar.Header)) (io.WriteCloser, error) { closed: false, } tr := tar.NewReader(reader) - tr.RawAccounting = true t.closeMutex.Lock() go func() { hdr, err := tr.Next() diff --git a/vendor/github.com/containers/storage/store.go b/vendor/github.com/containers/storage/store.go index dd3405212..af69a4b2d 100644 --- a/vendor/github.com/containers/storage/store.go +++ b/vendor/github.com/containers/storage/store.go @@ -1502,6 +1502,7 @@ func (s *store) ImageBigData(id, key string) ([]byte, error) { if err != nil { return nil, err } + foundImage := false for _, s := range append([]ROImageStore{istore}, istores...) { store := s store.RLock() @@ -1515,6 +1516,12 @@ func (s *store) ImageBigData(id, key string) ([]byte, error) { if err == nil { return data, nil } + if store.Exists(id) { + foundImage = true + } + } + if foundImage { + return nil, errors.Wrapf(os.ErrNotExist, "error locating item named %q for image with ID %q", key, id) } return nil, errors.Wrapf(ErrImageUnknown, "error locating image with ID %q", id) } @@ -1587,10 +1594,12 @@ func (s *store) ImageSize(id string) (int64, error) { return -1, errors.Wrapf(ErrImageUnknown, "error locating image with ID %q", id) } - // Start with a list of the image's top layers. + // Start with a list of the image's top layers, if it has any. queue := make(map[string]struct{}) for _, layerID := range append([]string{image.TopLayer}, image.MappedTopLayers...) { - queue[layerID] = struct{}{} + if layerID != "" { + queue[layerID] = struct{}{} + } } visited := make(map[string]struct{}) // Walk all of the layers. |