mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

builtins.readFile: Put the references of the file, not those needed to realize the file, into the context

Browse source
This commit is contained in:
Shea Levy 2017-01-10 12:22:22 -05:00
parent 7adb986e35
commit 451c223dee
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libexpr/primops.cc
View file

@ -779,6 +779,9 @@ 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);
context = state.store->isInStore(path) ?
state.store->queryPathInfo(state.store->toStorePath(path))->references :
PathSet{};
mkString(v, s.c_str(), context); mkString(v, s.c_str(), context);
} }