aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-05-15 17:26:20 +0200
committerEelco Dolstra <edolstra@gmail.com>2017-05-15 17:36:32 +0200
commitb30f5784d0184688de964f6239e373b62101ebc4 (patch)
treec5ae21e95289b15bb9a39efdf26631c8d7f5c9b8 /src
parent2b761d5f50b7dc17dc55c31980c2253c37b3c920 (diff)
Linux sandbox: Don't barf on invalid paths
This is useful when we're using a diverted store (e.g. "--store local?root=/tmp/nix") in conjunction with a statically-linked sh from the host store (e.g. "sandbox-paths =/bin/sh=/nix/store/.../bin/busybox").
Diffstat (limited to 'src')
-rw-r--r--src/libstore/build.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 270500d81..5ec4cbf66 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1774,6 +1774,7 @@ void DerivationGoal::startBuilder()
try {
if (worker.store.isInStore(i.second.source))
worker.store.computeFSClosure(worker.store.toStorePath(i.second.source), closure);
+ } catch (InvalidPath & e) {
} catch (Error & e) {
throw Error(format("while processing ‘build-sandbox-paths’: %s") % e.what());
}