lix-project/lix
20
58
Fork 31
Code Issues 352 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Give a better error message if a path in build-sandbox-paths is invalid

Browse source
This commit is contained in:
Eelco Dolstra 2016-09-08 17:30:25 +02:00
parent 0babc4ff31
commit e4bdd49022
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/build.cc
View file

@ -1874,8 +1874,12 @@ void DerivationGoal::startBuilder()
/* Add the closure of store paths to the chroot. */ /* Add the closure of store paths to the chroot. */
PathSet closure; PathSet closure;
for (auto & i : dirsInChroot) for (auto & i : dirsInChroot)
try {
if (worker.store.isInStore(i.second)) if (worker.store.isInStore(i.second))
worker.store.computeFSClosure(worker.store.toStorePath(i.second), closure); worker.store.computeFSClosure(worker.store.toStorePath(i.second), closure);
} catch (Error & e) {
throw Error(format("while processing ‘build-sandbox-paths’: %s") % e.what());
}
for (auto & i : closure) for (auto & i : closure)
dirsInChroot[i] = i; dirsInChroot[i] = i;