opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-03 09:17:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

pkg/trust: use fileutils.(Le|E)xists

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2024-04-10 18:36:20 +02:00
parent 1991990d5a
commit 0e8d1ad811
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/trust/policy.go
View File

@ -15,6 +15,7 @@ import (
"github.com/containers/common/pkg/config" "github.com/containers/common/pkg/config"
"github.com/containers/image/v5/types" "github.com/containers/image/v5/types"
"github.com/containers/storage/pkg/fileutils"
"github.com/containers/storage/pkg/homedir" "github.com/containers/storage/pkg/homedir"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -61,7 +62,7 @@ func DefaultPolicyPath(sys *types.SystemContext) string {
} }
userPolicyFilePath := filepath.Join(homedir.Get(), filepath.FromSlash(".config/containers/policy.json")) userPolicyFilePath := filepath.Join(homedir.Get(), filepath.FromSlash(".config/containers/policy.json"))
_, err := os.Stat(userPolicyFilePath) err := fileutils.Exists(userPolicyFilePath)
if err == nil { if err == nil {
return userPolicyFilePath return userPolicyFilePath
} }
@ -218,7 +219,7 @@ func AddPolicyEntries(policyPath string, input AddPolicyEntriesInput) error {
return err return err
} }
_, err = os.Stat(policyPath) err = fileutils.Exists(policyPath)
if !os.IsNotExist(err) { if !os.IsNotExist(err) {
policyContent, err := os.ReadFile(policyPath) policyContent, err := os.ReadFile(policyPath)
if err != nil { if err != nil {

3
pkg/trust/registries.go
View File

@ -7,6 +7,7 @@ import (
"strings" "strings"
"github.com/containers/image/v5/types" "github.com/containers/image/v5/types"
"github.com/containers/storage/pkg/fileutils"
"github.com/docker/docker/pkg/homedir" "github.com/docker/docker/pkg/homedir"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
) )
@ -39,7 +40,7 @@ func RegistriesDirPath(sys *types.SystemContext) string {
return sys.RegistriesDirPath return sys.RegistriesDirPath
} }
userRegistriesDirPath := filepath.Join(homedir.Get(), userRegistriesDir) userRegistriesDirPath := filepath.Join(homedir.Get(), userRegistriesDir)
if _, err := os.Stat(userRegistriesDirPath); err == nil { if err := fileutils.Exists(userRegistriesDirPath); err == nil {
return userRegistriesDirPath return userRegistriesDirPath
} }
if sys != nil && sys.RootForImplicitAbsolutePaths != "" { if sys != nil && sys.RootForImplicitAbsolutePaths != "" {