puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Linux sandbox: Don't barf on invalid paths

Browse source 
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").
This commit is contained in:
Eelco Dolstra 2017-05-15 17:26:20 +02:00
parent 2b761d5f50
commit b30f5784d0
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libstore/build.cc
View file

@ -1774,6 +1774,7 @@ void DerivationGoal::startBuilder()
try { try {
if (worker.store.isInStore(i.second.source)) if (worker.store.isInStore(i.second.source))
worker.store.computeFSClosure(worker.store.toStorePath(i.second.source), closure); worker.store.computeFSClosure(worker.store.toStorePath(i.second.source), closure);
} catch (InvalidPath & e) {
} catch (Error & e) { } catch (Error & e) {
throw Error(format("while processing ‘build-sandbox-paths’: %s") % e.what()); throw Error(format("while processing ‘build-sandbox-paths’: %s") % e.what());
} }