summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2018-03-20 15:30:55 +0100
committerEelco Dolstra <edolstra@gmail.com>2018-03-20 15:30:55 +0100
commit21ebf6a16028291914bd14b0e5463b020dc7affa (patch)
tree16314463925fea37d390ac4effdf7cbf7a4befa7
parent1aca195e52d4fbf76908e6588b55ed8b5b25cfc8 (diff)
SSHMaster: Optionally pass -v to ssh
-rw-r--r--src/libstore/ssh.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libstore/ssh.cc b/src/libstore/ssh.cc
index 7ff7a9bff..033c58093 100644
--- a/src/libstore/ssh.cc
+++ b/src/libstore/ssh.cc
@@ -49,6 +49,8 @@ std::unique_ptr<SSHMaster::Connection> SSHMaster::startCommand(const std::string
addCommonSSHOpts(args);
if (socketPath != "")
args.insert(args.end(), {"-S", socketPath});
+ if (verbosity >= lvlChatty)
+ args.push_back("-v");
args.push_back(command);
execvp(args.begin()->c_str(), stringsToCharPtrs(args).data());
@@ -93,6 +95,8 @@ Path SSHMaster::startMaster()
, "-o", "LocalCommand=echo started"
, "-o", "PermitLocalCommand=yes"
};
+ if (verbosity >= lvlChatty)
+ args.push_back("-v");
addCommonSSHOpts(args);
execvp(args.begin()->c_str(), stringsToCharPtrs(args).data());