cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Drop ImportError and FindError

Browse source 
We're not catching these anywhere.
This commit is contained in:
Eelco Dolstra 2014-06-12 13:00:54 +02:00
parent 718f20da6d
commit 0960d674d4
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/nixexpr.hh
View file

@ -15,8 +15,6 @@ MakeError(AssertionError, EvalError)
MakeError(ThrownError, AssertionError) MakeError(ThrownError, AssertionError)
MakeError(Abort, EvalError) MakeError(Abort, EvalError)
MakeError(TypeError, EvalError) MakeError(TypeError, EvalError)
MakeError(ImportError, EvalError) // error building an imported derivation
MakeError(FindError, EvalError) // error building a nix-path component
MakeError(UndefinedVarError, Error) MakeError(UndefinedVarError, Error)

4
src/libexpr/primops.cc
View file

@ -81,8 +81,6 @@ static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args
} catch (InvalidPathError & e) { } catch (InvalidPathError & e) {
throw EvalError(format("cannot import `%1%', since path `%2%' is not valid, at %3%") throw EvalError(format("cannot import `%1%', since path `%2%' is not valid, at %3%")
% path % e.path % pos); % path % e.path % pos);
} catch (Error & e) {
throw ImportError(e.msg());
} }
if (isStorePath(path) && store->isValidPath(path) && isDerivation(path)) { 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) { } catch (InvalidPathError & e) {
throw EvalError(format("cannot find `%1%', since path `%2%' is not valid, at %3%") throw EvalError(format("cannot find `%1%', since path `%2%' is not valid, at %3%")
% path % e.path % pos); % path % e.path % pos);
} catch (Error & e) {
throw FindError(e.msg());
} }
mkPath(v, state.findFile(searchPath, path).c_str()); mkPath(v, state.findFile(searchPath, path).c_str());