mirror of
https://github.com/containers/podman.git
synced 2025-12-03 11:49:18 +08:00
vendor: update containers/{buildah,common,image,storage}
The change in healthcheck_run_test.go, depends on the containers/image change: commit b6afa8ca7b324aca8fd5a7b5b206fc05c0c04874 Author: Mikhail Sokolov <msokolov@evolution.com> Date: Fri Mar 15 13:37:44 2024 +0200 Add support for Docker HealthConfig.StartInterval (v25.0.0+) Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
6
vendor/github.com/containers/common/pkg/config/modules.go
generated
vendored
6
vendor/github.com/containers/common/pkg/config/modules.go
generated
vendored
@@ -2,9 +2,9 @@ package config
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/containers/storage/pkg/fileutils"
|
||||
"github.com/containers/storage/pkg/homedir"
|
||||
"github.com/containers/storage/pkg/unshare"
|
||||
"github.com/hashicorp/go-multierror"
|
||||
@@ -76,7 +76,7 @@ func ModuleDirectories() ([]string, error) { // Public API for shell completions
|
||||
// Resolve the specified path to a module.
|
||||
func resolveModule(path string, dirs []string) (string, error) {
|
||||
if filepath.IsAbs(path) {
|
||||
_, err := os.Stat(path)
|
||||
err := fileutils.Exists(path)
|
||||
return path, err
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@ func resolveModule(path string, dirs []string) (string, error) {
|
||||
var multiErr error
|
||||
for _, d := range dirs {
|
||||
candidate := filepath.Join(d, path)
|
||||
_, err := os.Stat(candidate)
|
||||
err := fileutils.Exists(candidate)
|
||||
if err == nil {
|
||||
return candidate, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user