ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into flake

Browse Source
This commit is contained in:
Eelco Dolstra
2020-03-04 15:28:23 +01:00
parent be8eb9d00d 123bee1db5
commit 4b5bb4e760
10 changed files with 133 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/hydra-eval-jobs/hydra-eval-jobs.cc
View File

@ -147,9 +147,10 @@ static void worker(
nlohmann::json reply;
try {
auto v = findAlongAttrPath(state, attrPath, autoArgs, *vRoot).first;
auto vTmp = findAlongAttrPath(state, attrPath, autoArgs, *vRoot).first;
state.forceValue(*v);
auto v = state.allocValue();
state.autoCallFunction(autoArgs, *vTmp, *v);
if (auto drv = getDerivation(state, *v, false)) {
@ -231,6 +232,11 @@ static void worker(
reply["attrs"] = std::move(attrs);
}
else if (v->type == tNull)
;
else throw TypeError("attribute '%s' is %s, which is not supported", attrPath, showType(*v));
} catch (EvalError & e) {
reply["error"] = filterANSIEscapes(e.msg(), true);
}