mirror of
https://github.com/containers/podman.git
synced 2025-12-06 05:37:49 +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:
7
vendor/github.com/containers/common/pkg/version/version.go
generated
vendored
7
vendor/github.com/containers/common/pkg/version/version.go
generated
vendored
@@ -3,9 +3,10 @@ package version
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"os"
|
||||
"os/exec"
|
||||
"strings"
|
||||
|
||||
"github.com/containers/storage/pkg/fileutils"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -15,7 +16,7 @@ const (
|
||||
// Note: This function is copied from containers/podman libpod/util.go
|
||||
// Please see https://github.com/containers/common/pull/1460
|
||||
func queryPackageVersion(cmdArg ...string) string {
|
||||
_, err := os.Stat(cmdArg[0])
|
||||
err := fileutils.Exists(cmdArg[0])
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
@@ -63,7 +64,7 @@ func queryPackageVersion(cmdArg ...string) string {
|
||||
// Note: This function is copied from containers/podman libpod/util.go
|
||||
// Please see https://github.com/containers/common/pull/1460
|
||||
func Package(program string) string { // program is full path
|
||||
_, err := os.Stat(program)
|
||||
err := fileutils.Exists(program)
|
||||
if err != nil {
|
||||
return UnknownPackage
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user