diff options
author | rebecca “wiggles” turner <rbt@sent.as> | 2024-10-05 17:33:00 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@localhost> | 2024-10-05 17:33:00 +0000 |
commit | 86b213e6321540328fb11c3ea99c0b24becc45b0 (patch) | |
tree | d110b44daad528a73e4a75ad69f149ea6b7d51ad /src/libstore/pathlocks.hh | |
parent | a3dd07535c183433a3f1f97596e9d2b41f8a33ba (diff) | |
parent | ee0c195eba7d16b796fd9883e3fe88c0d64ff0bf (diff) |
Merge "Split ignoreException to avoid suppressing CTRL-C" into main
Diffstat (limited to 'src/libstore/pathlocks.hh')
-rw-r--r-- | src/libstore/pathlocks.hh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstore/pathlocks.hh b/src/libstore/pathlocks.hh index d06d031b5..feb0f5548 100644 --- a/src/libstore/pathlocks.hh +++ b/src/libstore/pathlocks.hh @@ -1,6 +1,7 @@ #pragma once ///@file +#include "error.hh" #include "file-descriptor.hh" namespace nix { @@ -53,7 +54,7 @@ struct FdLock if (acquired) lockFile(fd, ltNone, false); } catch (SysError &) { - ignoreException(); + ignoreExceptionInDestructor(); } } }; |