emilytrau/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Revert "Propagate path context via builtins.readFile"

Browse source 
This reverts commit f7f0116dd7.

Issue #1174.
This commit is contained in:
Eelco Dolstra 2017-01-24 15:31:54 +01:00
parent fa738e50bc
commit 4e6a2fbc56
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/primops.cc
View file

@ -779,7 +779,7 @@ static void prim_readFile(EvalState & state, const Pos & pos, Value * * args, Va
string s = readFile(state.checkSourcePath(path)); string s = readFile(state.checkSourcePath(path));
if (s.find((char) 0) != string::npos) if (s.find((char) 0) != string::npos)
throw Error(format("the contents of the file ‘%1%’ cannot be represented as a Nix string") % path); throw Error(format("the contents of the file ‘%1%’ cannot be represented as a Nix string") % path);
mkString(v, s.c_str(), context); mkString(v, s.c_str());
} }