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

Handle repairing paths that are in build-chroot-dirs

Browse source
This commit is contained in:
Eelco Dolstra 2012-10-03 11:20:16 -04:00
parent a3f205b249
commit a807edfae8
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/build.cc
View file

@ -1875,6 +1875,13 @@ void DerivationGoal::startBuilder()
} }
} }
/* If we're repairing, it's possible that we're rebuilding a
path that is in settings.dirsInChroot (typically the
dependencies of /bin/sh). Throw them out. */
if (repair)
foreach (DerivationOutputs::iterator, i, drv.outputs)
dirsInChroot.erase(i->second.path);
#else #else
throw Error("chroot builds are not supported on this platform"); throw Error("chroot builds are not supported on this platform");
#endif #endif