aboutsummaryrefslogtreecommitdiff
path: root/src/libstore
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-12-13 12:53:20 +0100
committerEelco Dolstra <edolstra@gmail.com>2019-12-13 12:53:20 +0100
commitd1b238ec3cd74d652af46f577f992c9a44ac8e32 (patch)
treeb661f49b9389ad54e5fe3155548e0fcdfaa57a00 /src/libstore
parent2da4c61049aef9e318a35ea500d6351e0ab10907 (diff)
Simplify
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/ssh.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libstore/ssh.cc b/src/libstore/ssh.cc
index ddc99a6cd..2ee7115c5 100644
--- a/src/libstore/ssh.cc
+++ b/src/libstore/ssh.cc
@@ -47,13 +47,10 @@ std::unique_ptr<SSHMaster::Connection> SSHMaster::startCommand(const std::string
throw SysError("duping over stderr");
Strings args;
- const char * execInto;
if (fakeSSH) {
- execInto = "bash";
args = { "bash", "-c" };
} else {
- execInto = "ssh";
args = { "ssh", host.c_str(), "-x", "-a" };
addCommonSSHOpts(args);
if (socketPath != "")
@@ -66,7 +63,7 @@ std::unique_ptr<SSHMaster::Connection> SSHMaster::startCommand(const std::string
execvp(args.begin()->c_str(), stringsToCharPtrs(args).data());
// could not exec ssh/bash
- throw SysError("Failed to exec into %s. Is it in PATH?", execInto);
+ throw SysError("unable to execute '%s'", args.front());
});
@@ -112,7 +109,7 @@ Path SSHMaster::startMaster()
addCommonSSHOpts(args);
execvp(args.begin()->c_str(), stringsToCharPtrs(args).data());
- throw SysError("Failed to exec into ssh. Is it in PATH?");
+ throw SysError("unable to execute '%s'", args.front());
});
out.writeSide = -1;