mirror of
https://github.com/containers/podman.git
synced 2025-12-01 18:49:18 +08:00
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>
This commit is contained in:
2
vendor/github.com/containers/storage/VERSION
generated
vendored
2
vendor/github.com/containers/storage/VERSION
generated
vendored
@@ -1 +1 @@
|
||||
1.13.3
|
||||
1.13.4
|
||||
|
||||
2
vendor/github.com/containers/storage/images_ffjson.go
generated
vendored
2
vendor/github.com/containers/storage/images_ffjson.go
generated
vendored
@@ -1,5 +1,5 @@
|
||||
// Code generated by ffjson <https://github.com/pquerna/ffjson>. DO NOT EDIT.
|
||||
// source: images.go
|
||||
// source: ./images.go
|
||||
|
||||
package storage
|
||||
|
||||
|
||||
1
vendor/github.com/containers/storage/pkg/tarlog/tarlogger.go
generated
vendored
1
vendor/github.com/containers/storage/pkg/tarlog/tarlogger.go
generated
vendored
@@ -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()
|
||||
|
||||
13
vendor/github.com/containers/storage/store.go
generated
vendored
13
vendor/github.com/containers/storage/store.go
generated
vendored
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user