From 00092b2d356293a7af9d4d8125a689f90c461591 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 10:11:42 -0400 Subject: Keep build directory if not all expected outputs were produced Fixes issue #123 in Nixpkgs. --- src/libstore/build.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 43565ac024aa..04ba02d14e46 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -1352,8 +1352,6 @@ void DerivationGoal::buildDone() % drvPath % statusToString(status)); } - deleteTmpDir(true); - /* Delete the chroot (if we were using one). */ autoDelChroot.reset(); /* this runs the destructor */ @@ -1370,6 +1368,8 @@ void DerivationGoal::buildDone() being valid. */ computeClosure(); + deleteTmpDir(true); + /* It is now safe to delete the lock files, since all future lockers will see that the output paths are valid; they will not create new lock files with the same names as the old @@ -2239,7 +2239,7 @@ void DerivationGoal::deleteTmpDir(bool force) if (tmpDir != "") { if (settings.keepFailed && !force) { printMsg(lvlError, - format("builder for `%1%' failed; keeping build directory `%2%'") + format("note: keeping build directory `%2%'") % drvPath % tmpDir); if (buildUser.enabled() && !amPrivileged()) getOwnership(tmpDir); -- cgit 1.4.1