forked from lix-project/lix
Drop ImportError and FindError
We're not catching these anywhere.
This commit is contained in:
parent
718f20da6d
commit
0960d674d4
src/libexpr
|
@ -15,8 +15,6 @@ MakeError(AssertionError, EvalError)
|
|||
MakeError(ThrownError, AssertionError)
|
||||
MakeError(Abort, EvalError)
|
||||
MakeError(TypeError, EvalError)
|
||||
MakeError(ImportError, EvalError) // error building an imported derivation
|
||||
MakeError(FindError, EvalError) // error building a nix-path component
|
||||
MakeError(UndefinedVarError, Error)
|
||||
|
||||
|
||||
|
|
|
@ -81,8 +81,6 @@ static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args
|
|||
} catch (InvalidPathError & e) {
|
||||
throw EvalError(format("cannot import `%1%', since path `%2%' is not valid, at %3%")
|
||||
% path % e.path % pos);
|
||||
} catch (Error & e) {
|
||||
throw ImportError(e.msg());
|
||||
}
|
||||
|
||||
if (isStorePath(path) && store->isValidPath(path) && isDerivation(path)) {
|
||||
|
@ -701,8 +699,6 @@ static void prim_findFile(EvalState & state, const Pos & pos, Value * * args, Va
|
|||
} catch (InvalidPathError & e) {
|
||||
throw EvalError(format("cannot find `%1%', since path `%2%' is not valid, at %3%")
|
||||
% path % e.path % pos);
|
||||
} catch (Error & e) {
|
||||
throw FindError(e.msg());
|
||||
}
|
||||
|
||||
mkPath(v, state.findFile(searchPath, path).c_str());
|
||||
|
|
Loading…
Reference in a new issue