diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-08 19:49:24 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-08 20:04:04 +0100 |
commit | 5f18cd2e84bb4d7405f7dbcc8b6554365556a3a1 (patch) | |
tree | a94dda435037890dcc3af5bf9d5df5d3a01f01b4 /src/libexpr/eval.cc | |
parent | 52172607cfc33867c0cdb526bef99c315e98baa2 (diff) |
Make "${./path} ..." evaluate to a string, not a path
Wacky string coercion semantics caused expressions like
exec = "${./my-script} params...";
to evaluate to a path (‘/path/my-script params’), because
anti-quotations are desuged to string concatenation:
exec = ./my-script + " params...";
By constrast, adding a space at the start would yield a string as
expected:
exec = " ${./my-script} params...";
Now the first example also evaluates to a string.
Diffstat (limited to 'src/libexpr/eval.cc')
-rw-r--r-- | src/libexpr/eval.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 676dd3ac4..a1613a420 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -966,7 +966,7 @@ void ExprConcatStrings::eval(EvalState & state, Env & env, Value & v) since paths are copied when they are used in a derivation), and none of the strings are allowed to have contexts. */ if (first) { - isPath = vStr.type == tPath; + isPath = !forceString && vStr.type == tPath; first = false; } |