mirror of
https://github.com/containers/podman.git
synced 2025-11-01 22:32:50 +08:00
Vendor in latest c/common
Pull in updates made to the filters code for images. Filters now perform an AND operation except for th reference filter which does an OR operation for positive case but an AND operation for negative cases. Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
This commit is contained in:
6
vendor/github.com/containers/common/libimage/image_tree.go
generated
vendored
6
vendor/github.com/containers/common/libimage/image_tree.go
generated
vendored
@ -1,9 +1,9 @@
|
||||
//go:build !remote
|
||||
// +build !remote
|
||||
|
||||
package libimage
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
@ -38,7 +38,7 @@ func (i *Image) Tree(traverseChildren bool) (string, error) {
|
||||
fmt.Fprintf(sb, "No Image Layers")
|
||||
}
|
||||
|
||||
layerTree, err := i.runtime.layerTree(nil)
|
||||
layerTree, err := i.runtime.layerTree(context.Background(), nil)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
@ -53,7 +53,7 @@ func (i *Image) Tree(traverseChildren bool) (string, error) {
|
||||
return tree.Print(), nil
|
||||
}
|
||||
|
||||
// Walk all layers of the image and assemlbe their data. Note that the
|
||||
// Walk all layers of the image and assemble their data. Note that the
|
||||
// tree is constructed in reverse order to remain backwards compatible
|
||||
// with Podman.
|
||||
contents := []string{}
|
||||
|
||||
Reference in New Issue
Block a user