From 70f75be199d8db959d313dc40111893fba56415f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Oct 2012 15:22:25 -0400 Subject: getDerivation(): Don't always quietly ignore assertion failure Ignoring assertion failures makes some sense for nix-env -qa, but not for nix-instantiate/nix-build or hydra-eval-jobs. --- src/libexpr/get-drvs.hh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/libexpr/get-drvs.hh') diff --git a/src/libexpr/get-drvs.hh b/src/libexpr/get-drvs.hh index 25d8baa559b2..8159417a0131 100644 --- a/src/libexpr/get-drvs.hh +++ b/src/libexpr/get-drvs.hh @@ -75,10 +75,12 @@ typedef list DrvInfos; /* If value `v' denotes a derivation, store information about the derivation in `drv' and return true. Otherwise, return false. */ -bool getDerivation(EvalState & state, Value & v, DrvInfo & drv); +bool getDerivation(EvalState & state, Value & v, DrvInfo & drv, + bool ignoreAssertionFailures); void getDerivations(EvalState & state, Value & v, const string & pathPrefix, - Bindings & autoArgs, DrvInfos & drvs); + Bindings & autoArgs, DrvInfos & drvs, + bool ignoreAssertionFailures); } -- cgit 1.4.1