wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 22:01:15 +02:00
Code Activity

Merge branch '2.24-maintenance' into 2.24-maintenance

Browse source
This commit is contained in:
Pascal Jungblut 2025-05-14 22:58:17 +02:00 • committed by GitHub
commit fa2a3c6de8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libutil/file-system.cc
View file

@ -93,7 +93,7 @@ Path canonPath(PathView path, bool resolveSymlinks)
(std::string & result, std::string_view & remaining) { (std::string & result, std::string_view & remaining) {
if (resolveSymlinks && fs::is_symlink(result)) { if (resolveSymlinks && fs::is_symlink(result)) {
if (++followCount >= maxFollow) if (++followCount >= maxFollow)
throw Error("infinite symlink recursion in path '%0%'", remaining); throw Error("infinite symlink recursion in path '%1%'", remaining);
remaining = (temp = concatStrings(readLink(result), remaining)); remaining = (temp = concatStrings(readLink(result), remaining));
if (isAbsolute(remaining)) { if (isAbsolute(remaining)) {
/* restart for symlinks pointing to absolute path */ /* restart for symlinks pointing to absolute path */