diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-04T20·19+0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-04T20·19+0200 |
commit | bd9b1d97b42f307c8b595bb2de9b15bec1405b23 (patch) | |
tree | 48bd5555658fb2c734bf85ce8bd35eace826cb68 /src/libexpr/get-drvs.cc | |
parent | 8160f794e79a4a2a5269080b408d69fc93d7a305 (diff) |
Show position info in string concatenation / addition errors
Diffstat (limited to 'src/libexpr/get-drvs.cc')
-rw-r--r-- | src/libexpr/get-drvs.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libexpr/get-drvs.cc b/src/libexpr/get-drvs.cc index 88ea68a5f0bf..57b87ab58d41 100644 --- a/src/libexpr/get-drvs.cc +++ b/src/libexpr/get-drvs.cc @@ -13,7 +13,7 @@ string DrvInfo::queryDrvPath() if (drvPath == "" && attrs) { Bindings::iterator i = attrs->find(state->sDrvPath); PathSet context; - drvPath = i != attrs->end() ? state->coerceToPath(*i->value, context) : ""; + drvPath = i != attrs->end() ? state->coerceToPath(*i->pos, *i->value, context) : ""; } return drvPath; } @@ -24,7 +24,7 @@ string DrvInfo::queryOutPath() if (outPath == "" && attrs) { Bindings::iterator i = attrs->find(state->sOutPath); PathSet context; - outPath = i != attrs->end() ? state->coerceToPath(*i->value, context) : ""; + outPath = i != attrs->end() ? state->coerceToPath(*i->pos, *i->value, context) : ""; } return outPath; } @@ -50,7 +50,7 @@ DrvInfo::Outputs DrvInfo::queryOutputs() Bindings::iterator outPath = out->value->attrs->find(state->sOutPath); if (outPath == out->value->attrs->end()) continue; // FIXME: throw error? PathSet context; - outputs[name] = state->coerceToPath(*outPath->value, context); + outputs[name] = state->coerceToPath(*outPath->pos, *outPath->value, context); } } else outputs["out"] = queryOutPath(); |