diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-06-07 11:54:03 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-06-07 11:54:03 +0200 |
| commit | aeafff536f933b07836b14d089dfc52b0e432ec9 (patch) | |
| tree | 4ede554999f98cf9e19c04098c934db52efae795 /nix/libstore/pathlocks.cc | |
| parent | 9dee9e8ffe4650949bd3ad2edf559cf4a33e9e6e (diff) | |
| parent | f82c58539e1f7b9b864e68ea2ab0c6a17c15fbb5 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'nix/libstore/pathlocks.cc')
| -rw-r--r-- | nix/libstore/pathlocks.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nix/libstore/pathlocks.cc b/nix/libstore/pathlocks.cc index 830858ff8d..9797ddd7ab 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(); + } } |