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

ExprConcatStrings: canonicalize concatenated paths

Browse source
This commit is contained in:
Shea Levy 2015-02-19 08:39:25 -05:00
parent e0953d53de
commit 4646e94610
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/libexpr/eval.cc
View file

@ -1174,7 +1174,8 @@ void ExprConcatStrings::eval(EvalState & state, Env & env, Value & v)
else if (firstType == tPath) { else if (firstType == tPath) {
if (!context.empty()) if (!context.empty())
throwEvalError("a string that refers to a store path cannot be appended to a path, at %1%", pos); throwEvalError("a string that refers to a store path cannot be appended to a path, at %1%", pos);
mkPath(v, s.str().c_str()); auto path = canonPath(s.str());
mkPath(v, path.c_str());
} else } else
mkString(v, s.str(), context); mkString(v, s.str(), context);
} }