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

* Print a better error message when a non-derivation attribute set is

Browse source 
coerced to a string.
This commit is contained in:
Eelco Dolstra 2008-07-24 14:52:25 +00:00
parent 096198d11f
commit fc691e1cbd
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/libexpr/eval.cc
View file

@ -48,6 +48,11 @@ LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2))
throw EvalError(format(s) % s2); throw EvalError(format(s) % s2);
} }
LocalNoInlineNoReturn(void throwTypeError(const char * s))
{
throw TypeError(s);
}
LocalNoInlineNoReturn(void throwTypeError(const char * s, const string & s2)) LocalNoInlineNoReturn(void throwTypeError(const char * s, const string & s2))
{ {
throw TypeError(format(s) % s2); throw TypeError(format(s) % s2);
@ -305,9 +310,11 @@ string coerceToString(EvalState & state, Expr e, PathSet & context,
} }
ATermList es; ATermList es;
if (matchAttrs(e, es)) if (matchAttrs(e, es)) {
return coerceToString(state, makeSelect(e, toATerm("outPath")), Expr e2 = queryAttr(e, "outPath");
context, coerceMore, copyToStore); if (!e2) throwTypeError("cannot coerce an attribute set (except a derivation) to a string");
return coerceToString(state, e2, context, coerceMore, copyToStore);
}
if (coerceMore) { if (coerceMore) {