Merge "libstore/ssh: only resume the logger when we paused it" into main

1 files changed, 2 insertions, 1 deletions

diff --git a/src/libstore/ssh.cc b/src/libstore/ssh.cc
index 0d7bfa01d..8386b0e0a 100644
--- a/src/libstore/ssh.cc
+++ b/src/libstore/ssh.cc
@@ -65,10 +65,11 @@ std::unique_ptr<SSHMaster::Connection> SSHMaster::startCommand(const std::string
     ProcessOptions options;
     options.dieWithParent = false;
 
+    std::optional<Finally<std::function<void()>>> resumeLoggerDefer;
     if (!fakeSSH && !useMaster) {
         logger->pause();
+        resumeLoggerDefer.emplace([&]() { logger->resume(); });
     }
-    Finally cleanup = [&]() { logger->resume(); };
 
     conn->sshPid = startProcess([&]() {
         restoreProcessContext();