Merge pull request #2074 from dfr/freebsd-exists

pkg/fileutils: fix Lexists on FreeBSD (second attempt)
containers · Aug 25, 2024 · 9a14315 · 9a14315
2 parents 4e18d1f + 7afe759
commit 9a14315
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/pkg/fileutils/exists_freebsd.go b/pkg/fileutils/exists_freebsd.go
@@ -27,10 +27,11 @@ func Lexists(path string) error {
 	// faccessat. In this case, the call to faccessat will return EINVAL and
 	// we fall back to using Lstat.
 	err := unix.Faccessat(unix.AT_FDCWD, path, unix.F_OK, unix.AT_SYMLINK_NOFOLLOW)
-	if err != nil && errors.Is(err, syscall.EINVAL) {
-		_, err = os.Lstat(path)
-	}
 	if err != nil {
+		if errors.Is(err, syscall.EINVAL) {
+			_, err = os.Lstat(path)
+			return err
+		}
 		return &os.PathError{Op: "faccessat", Path: path, Err: err}
 	}
 	return nil