Remove no-op call to realiseContext()
This commit is contained in:
parent
c497fce011
commit
0dc8172458
|
@ -1891,20 +1891,9 @@ static void addPath(EvalState & state, const Pos & pos, const string & name, con
|
||||||
dstPath = state.store->printStorePath(*expectedStorePath);
|
dstPath = state.store->printStorePath(*expectedStorePath);
|
||||||
|
|
||||||
mkString(v, dstPath, {dstPath});
|
mkString(v, dstPath, {dstPath});
|
||||||
|
|
||||||
if (state.allowedPaths)
|
if (state.allowedPaths)
|
||||||
state.allowedPaths->insert(v.string.s);
|
state.allowedPaths->insert(v.string.s);
|
||||||
|
|
||||||
try {
|
|
||||||
state.realiseContext({});
|
|
||||||
} catch (InvalidPathError & e) {
|
|
||||||
throw EvalError({
|
|
||||||
.msg = hintfmt("cannot import '%1%', since path '%2%' is not valid", path, e.path),
|
|
||||||
.errPos = pos
|
|
||||||
});
|
|
||||||
} catch (Error & e) {
|
|
||||||
e.addTrace(pos, "while importing '%s'", path);
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue