diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-18 12:08:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 12:08:08 -0500 |
| commit | 094665ac0cccc04c7797881ff2a27ff330e9a72e (patch) | |
| tree | 5e858d21a6d9ad22049bb8188fa71727be14e523 /vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go | |
| parent | 0bbf8fa14035371cdc5bb04f5db51da8a8f94d48 (diff) | |
| parent | 774271c38a8c3e96c7518b3c03de2f00e87138be (diff) | |
| download | podman-094665ac0cccc04c7797881ff2a27ff330e9a72e.tar.gz podman-094665ac0cccc04c7797881ff2a27ff330e9a72e.tar.bz2 podman-094665ac0cccc04c7797881ff2a27ff330e9a72e.zip | |
Merge pull request #12894 from Luap99/deps
upgrade all dependencies
Diffstat (limited to 'vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go')
| -rw-r--r-- | vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go index 220d0b439..1576f2d4a 100644 --- a/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go +++ b/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go @@ -1,4 +1,3 @@ -//go:build !windows // +build !windows package utils @@ -15,7 +14,7 @@ import ( func EnsureProcHandle(fh *os.File) error { var buf unix.Statfs_t if err := unix.Fstatfs(int(fh.Fd()), &buf); err != nil { - return fmt.Errorf("ensure %s is on procfs: %w", fh.Name(), err) + return fmt.Errorf("ensure %s is on procfs: %v", fh.Name(), err) } if buf.Type != unix.PROC_SUPER_MAGIC { return fmt.Errorf("%s is not on procfs", fh.Name()) @@ -53,7 +52,7 @@ func CloseExecFrom(minFd int) error { // Intentionally ignore errors from unix.CloseOnExec -- the cases where // this might fail are basically file descriptors that have already // been closed (including and especially the one that was created when - // os.ReadDir did the "opendir" syscall). + // ioutil.ReadDir did the "opendir" syscall). unix.CloseOnExec(fd) } return nil |