mirror of
https://github.com/containers/podman.git
synced 2025-09-13 10:46:03 +08:00
Update containers/storage to v1.16.5
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
17
vendor/github.com/containers/storage/pkg/fileutils/fileutils.go
generated
vendored
17
vendor/github.com/containers/storage/pkg/fileutils/fileutils.go
generated
vendored
@ -1,7 +1,6 @@
|
||||
package fileutils
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
@ -10,6 +9,7 @@ import (
|
||||
"strings"
|
||||
"text/scanner"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
@ -358,6 +358,21 @@ func ReadSymlinkedDirectory(path string) (string, error) {
|
||||
return realPath, nil
|
||||
}
|
||||
|
||||
// ReadSymlinkedPath returns the target directory of a symlink.
|
||||
// The target of the symbolic link can be a file and a directory.
|
||||
func ReadSymlinkedPath(path string) (realPath string, err error) {
|
||||
if realPath, err = filepath.Abs(path); err != nil {
|
||||
return "", errors.Wrapf(err, "unable to get absolute path for %q", path)
|
||||
}
|
||||
if realPath, err = filepath.EvalSymlinks(realPath); err != nil {
|
||||
return "", errors.Wrapf(err, "failed to canonicalise path for %q", path)
|
||||
}
|
||||
if _, err := os.Stat(realPath); err != nil {
|
||||
return "", errors.Wrapf(err, "failed to stat target %q of %q", realPath, path)
|
||||
}
|
||||
return realPath, nil
|
||||
}
|
||||
|
||||
// CreateIfNotExists creates a file or a directory only if it does not already exist.
|
||||
func CreateIfNotExists(path string, isDir bool) error {
|
||||
if _, err := os.Stat(path); err != nil {
|
||||
|
Reference in New Issue
Block a user