[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/09: daemon: ~PathLocks(): Handle exceptions.
From: |
Ludovic Courtès |
Subject: |
02/09: daemon: ~PathLocks(): Handle exceptions. |
Date: |
Tue, 31 May 2016 12:34:01 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit 63a5be07e252904eeb83a88dce37008e1affec1a
Author: Eelco Dolstra <address@hidden>
Date: Mon Jan 4 11:32:46 2016 +0100
daemon: ~PathLocks(): Handle exceptions.
Otherwise, since the call to write a "d" character to the lock file
can fail with ENOSPC, we can get an unhandled exception resulting in a
call to terminate().
---
nix/libstore/pathlocks.cc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/nix/libstore/pathlocks.cc b/nix/libstore/pathlocks.cc
index 830858f..9797ddd 100644
--- a/nix/libstore/pathlocks.cc
+++ b/nix/libstore/pathlocks.cc
@@ -162,7 +162,11 @@ bool PathLocks::lockPaths(const PathSet & _paths,
PathLocks::~PathLocks()
{
- unlock();
+ try {
+ unlock();
+ } catch (...) {
+ ignoreException();
+ }
}
- branch master updated (8fe5d95 -> b452811), Ludovic Courtès, 2016/05/31
- 02/09: daemon: ~PathLocks(): Handle exceptions.,
Ludovic Courtès <=
- 07/09: daemon: check: Keep the differing output if -K is given., Ludovic Courtès, 2016/05/31
- 08/09: daemon: Canonicalize gids to 0., Ludovic Courtès, 2016/05/31
- 09/09: daemon: rounds: Keep the differing output if -K is given., Ludovic Courtès, 2016/05/31
- 05/09: daemon: check: Fix assertion failure when some outputs are missing., Ludovic Courtès, 2016/05/31
- 01/09: daemon: Handle /tmp being a symlink., Ludovic Courtès, 2016/05/31
- 03/09: daemon: Fix --repair failure on multiple-output derivations., Ludovic Courtès, 2016/05/31
- 06/09: daemon: check: Fix "failed to produce output path"., Ludovic Courtès, 2016/05/31
- 04/09: daemon: When repairing, rebuild if there is no substituter., Ludovic Courtès, 2016/05/31