Make ~DerivationGoal more reliable

1 files changed, 3 insertions, 7 deletions

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index e8067acbd..5aea4742a 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -851,13 +851,9 @@ DerivationGoal::~DerivationGoal()
 {
     /* Careful: we should never ever throw an exception from a
        destructor. */
-    try {
-        killChild();
-        deleteTmpDir(false);
-        closeLogFile();
-    } catch (...) {
-        ignoreException();
-    }
+    try { killChild(); } catch (...) { ignoreException(); }
+    try { deleteTmpDir(false); } catch (...) { ignoreException(); }
+    try { closeLogFile(); } catch (...) { ignoreException(); }
 }