diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-21 20:39:10 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-21 20:39:10 +0000 |
| commit | 8313f0e939a99b1f715695c0e798cfb368dfc1f2 (patch) | |
| tree | 11267fbf06412c79395a6d05ec77872bc5e0761f /src/libstore/remote-store.cc | |
| parent | 18493fd9c48676ab26854739db67ac5d76ff9347 (diff) | |
| parent | 984e521392b3f41f7cdab203e5c00f3e00e27a28 (diff) | |
Merge remote-tracking branch 'upstream/master' into derivation-header-include-order
Diffstat (limited to 'src/libstore/remote-store.cc')
| -rw-r--r-- | src/libstore/remote-store.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index fc5ab5865..f5f2ab7fd 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -228,7 +228,7 @@ struct ConnectionHandle ~ConnectionHandle() { - if (!daemonException && std::uncaught_exception()) { + if (!daemonException && std::uncaught_exceptions()) { handle.markBad(); debug("closing daemon connection because of an exception"); } |