containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vfs: use fileutils.{Le,E}xists() 

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2024-04-04 16:02:02 +02:00
parent 2b26cbfd37
commit 1f09fadeb6
No known key found for this signature in database
GPG Key ID: 67E38F7A8BA21772
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/vfs/driver.go
View File

@ -12,6 +12,7 @@ import (
graphdriver "github.com/containers/storage/drivers" graphdriver "github.com/containers/storage/drivers"
"github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/archive"
"github.com/containers/storage/pkg/directory" "github.com/containers/storage/pkg/directory"
"github.com/containers/storage/pkg/fileutils"
"github.com/containers/storage/pkg/idtools" "github.com/containers/storage/pkg/idtools"
"github.com/containers/storage/pkg/parsers" "github.com/containers/storage/pkg/parsers"
"github.com/containers/storage/pkg/system" "github.com/containers/storage/pkg/system"
@ -210,7 +211,7 @@ func (d *Driver) dir2(id string, useImageStore bool) string {
} else { } else {
homedir = filepath.Join(d.home, "dir", filepath.Base(id)) homedir = filepath.Join(d.home, "dir", filepath.Base(id))
} }
if _, err := os.Stat(homedir); err != nil { if err := fileutils.Exists(homedir); err != nil {
additionalHomes := d.additionalHomes[:] additionalHomes := d.additionalHomes[:]
if d.imageStore != "" { if d.imageStore != "" {
additionalHomes = append(additionalHomes, d.imageStore) additionalHomes = append(additionalHomes, d.imageStore)
@ -269,7 +270,7 @@ func (d *Driver) ReadWriteDiskUsage(id string) (*directory.DiskUsage, error) {
// Exists checks to see if the directory exists for the given id. // Exists checks to see if the directory exists for the given id.
func (d *Driver) Exists(id string) bool { func (d *Driver) Exists(id string) bool {
_, err := os.Stat(d.dir(id)) err := fileutils.Exists(d.dir(id))
return err == nil return err == nil
} }