nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-25 08:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nix/eval.cc): move call to fs::create_directory out of assert

Browse Source 
If the call is inside the assertion, then in non-assert builds
the call would be stripped out. This is highly unexpected.
This commit is contained in:
Sergei Zimmerman 2024-10-19 00:40:14 +03:00
parent 694c378d14
commit 8277b50b6f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nix/eval.cc
View File

@ -89,8 +89,9 @@ struct CmdEval : MixJSON, InstallableValueCommand, MixReadOnlyOption
// FIXME: disallow strings with contexts? // FIXME: disallow strings with contexts?
writeFile(path.string(), v.string_view()); writeFile(path.string(), v.string_view());
else if (v.type() == nAttrs) { else if (v.type() == nAttrs) {
[[maybe_unused]] bool directoryCreated = fs::create_directory(path);
// Directory should not already exist // Directory should not already exist
assert(fs::create_directory(path.string())); assert(directoryCreated);
for (auto & attr : *v.attrs()) { for (auto & attr : *v.attrs()) {
std::string_view name = state->symbols[attr.name]; std::string_view name = state->symbols[attr.name];
try { try {