diff options
author | Shea Levy <shea@shealevy.com> | 2015-02-19T13·39-0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2015-02-19T13·39-0500 |
commit | 4646e946100f103edd509a716b9c1a8849fc7895 (patch) | |
tree | c141502a76809f254fbc93a6c05d40f261176c3b /src/libexpr | |
parent | e0953d53de1dbb89ef0ff779e53ffdb0d988e806 (diff) |
ExprConcatStrings: canonicalize concatenated paths
Diffstat (limited to 'src/libexpr')
-rw-r--r-- | src/libexpr/eval.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 298f6a3a60e3..95b56e84d89a 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -1174,7 +1174,8 @@ void ExprConcatStrings::eval(EvalState & state, Env & env, Value & v) else if (firstType == tPath) { if (!context.empty()) 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 mkString(v, s.str(), context); } |