[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
285/376: Make ~DerivationGoal more reliable
From: |
Ludovic Courtès |
Subject: |
285/376: Make ~DerivationGoal more reliable |
Date: |
Wed, 28 Jan 2015 22:05:39 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit bab8d9b52a75276980fed9288573abf4eb7308f8
Author: Eelco Dolstra <address@hidden>
Date: Wed Nov 12 11:35:53 2014 +0100
Make ~DerivationGoal more reliable
---
src/libstore/build.cc | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index e8067ac..5aea474 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(); }
}
- 272/376: Shut up a clang warning, (continued)
- 272/376: Shut up a clang warning, Ludovic Courtès, 2015/01/28
- 257/376: Revert "binary download: Use $NIX_CURL_FLAGS", Ludovic Courtès, 2015/01/28
- 266/376: doc: fixed nix-instantiate --find-file, Ludovic Courtès, 2015/01/28
- 282/376: download-from-binary-cache.pl: Fix flushing of stderr, Ludovic Courtès, 2015/01/28
- 256/376: Merge pull request #372 from wmertens/patch-4, Ludovic Courtès, 2015/01/28
- 280/376: Typo, Ludovic Courtès, 2015/01/28
- 281/376: nix-store --gc: Don't warn about missing manifests directory, Ludovic Courtès, 2015/01/28
- 161/376: Restructuring the Nix manual, Ludovic Courtès, 2015/01/28
- 271/376: Revert "Revert "Temporarily disable darwin builds while hydra's darwin is borked"", Ludovic Courtès, 2015/01/28
- 299/376: Remove Hydra scheduling priorities, Ludovic Courtès, 2015/01/28
- 285/376: Make ~DerivationGoal more reliable,
Ludovic Courtès <=
- 277/376: nix-daemon: Get peer credentials on Mac OS X, Ludovic Courtès, 2015/01/28
- 286/376: build-remote.pl.in: Add some more trace messages, Ludovic Courtès, 2015/01/28
- 288/376: Add functors (callable attribute sets)., Ludovic Courtès, 2015/01/28
- 236/376: nix-env: Add regular expression support in selectors, Ludovic Courtès, 2015/01/28
- 261/376: Improve printing of ASTs, Ludovic Courtès, 2015/01/28
- 269/376: Update release notes, Ludovic Courtès, 2015/01/28