mirror of
https://github.com/containers/podman.git
synced 2025-10-29 00:38:34 +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:
11
vendor/github.com/containers/storage/layers.go
generated
vendored
11
vendor/github.com/containers/storage/layers.go
generated
vendored
@ -2034,9 +2034,16 @@ func (s *simpleGetCloser) Close() error {
|
||||
// LOCKING BUG: See the comments in layerStore.Diff
|
||||
func (r *layerStore) newFileGetter(id string) (drivers.FileGetCloser, error) {
|
||||
if getter, ok := r.driver.(drivers.DiffGetterDriver); ok {
|
||||
return getter.DiffGetter(id)
|
||||
fgc, err := getter.DiffGetter(id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if fgc != nil {
|
||||
return fgc, nil
|
||||
}
|
||||
}
|
||||
path, err := r.Mount(id, drivers.MountOpts{})
|
||||
|
||||
path, err := r.Mount(id, drivers.MountOpts{Options: []string{"ro"}})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user