wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

Merge pull request #11378 from Mic92/nix-dir-errors

Browse source 
builtins.readDir: fix nix error trace on filesystem errors
This commit is contained in:
John Ericson 2024-09-11 13:10:28 -04:00 • committed by GitHub
commit db7c868d24
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 92 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libcmd/repl.cc
View file

@ -2,6 +2,7 @@
#include <cstdlib>
#include <cstring>
#include "error.hh"
#include "repl-interacter.hh"
#include "repl.hh"
@ -720,7 +721,14 @@ void NixRepl::loadFlake(const std::string & flakeRefS)
if (flakeRefS.empty())
throw Error("cannot use ':load-flake' without a path specified. (Use '.' for the current working directory.)");
auto flakeRef = parseFlakeRef(fetchSettings, flakeRefS, std::filesystem::current_path().string(), true);
std::filesystem::path cwd;
try {
cwd = std::filesystem::current_path();
} catch (std::filesystem::filesystem_error & e) {
throw SysError("cannot determine current working directory");
}
auto flakeRef = parseFlakeRef(fetchSettings, flakeRefS, cwd.string(), true);
if (evalSettings.pureEval && !flakeRef.input.isLocked())
throw Error("cannot use ':load-flake' on locked flake reference '%s' (use --impure to override)", flakeRefS);