From 21beb2820d3c625eeb98fea2e0cc05306b3b1577 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 11 Apr 2024 09:29:39 +0200 Subject: [PATCH] directory: use fileutils.(Le|E)xists Signed-off-by: Giuseppe Scrivano --- directory/directory_dest.go | 3 ++- directory/explicitfilepath/path.go | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/directory/directory_dest.go b/directory/directory_dest.go index 9d921924..a0e35ed6 100644 --- a/directory/directory_dest.go +++ b/directory/directory_dest.go @@ -15,6 +15,7 @@ import ( "github.com/containers/image/v5/internal/putblobdigest" "github.com/containers/image/v5/internal/signature" "github.com/containers/image/v5/types" + "github.com/containers/storage/pkg/fileutils" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" ) @@ -249,7 +250,7 @@ func (d *dirImageDestination) Commit(context.Context, types.UnparsedImage) error // returns true if path exists func pathExists(path string) (bool, error) { - _, err := os.Stat(path) + err := fileutils.Exists(path) if err == nil { return true, nil } diff --git a/directory/explicitfilepath/path.go b/directory/explicitfilepath/path.go index 32ae1ae8..69c1e072 100644 --- a/directory/explicitfilepath/path.go +++ b/directory/explicitfilepath/path.go @@ -4,6 +4,8 @@ import ( "fmt" "os" "path/filepath" + + "github.com/containers/storage/pkg/fileutils" ) // ResolvePathToFullyExplicit returns the input path converted to an absolute, no-symlinks, cleaned up path. @@ -11,7 +13,7 @@ import ( // a non-existent name (but not a symlink pointing to a non-existent name) // This is intended as a helper for implementations of types.ImageReference.PolicyConfigurationIdentity etc. func ResolvePathToFullyExplicit(path string) (string, error) { - switch _, err := os.Lstat(path); { + switch err := fileutils.Lexists(path); { case err == nil: return resolveExistingPathToFullyExplicit(path) case os.IsNotExist(err):