nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-04-15 13:47:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

libutil: Fix error message

Browse Source 
I encountered this with a misconfigured libutil. I doubt that a
non-lutimes config is viable, because tests were failing.

(cherry picked from commit 1cffcd91a9)

# Conflicts:
#	src/libutil/file-system.cc
This commit is contained in:
Robert Hensing 2025-03-26 08:59:29 +00:00 committed by Mergify
parent 8adc1f3011
commit 3cc7e8174d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libutil/file-system.cc
View File

@ -613,7 +613,11 @@ void setWriteTime(
if (utimes(path.c_str(), times) == -1)
throw SysError("changing modification time of '%s' (not a symlink)", path);
} else {
<<<<<<< HEAD
throw Error("Cannot modification time of symlink '%s'", path);
=======
throw Error("Cannot change modification time of symlink %s", path);
>>>>>>> 1cffcd91a (libutil: Fix error message)
}
#endif
#endif