cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'libstore-ssh-better-exec-error-message' of https://github.com/Profpatsch/nix

Browse source
This commit is contained in:
Eelco Dolstra 2019-12-13 12:51:36 +01:00
commit 2da4c61049
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/ssh.cc
View file

@ -47,10 +47,13 @@ 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 != "")
@ -62,7 +65,8 @@ std::unique_ptr<SSHMaster::Connection> SSHMaster::startCommand(const std::string
args.push_back(command);
execvp(args.begin()->c_str(), stringsToCharPtrs(args).data());
throw SysError("executing '%s' on '%s'", command, host);
// could not exec ssh/bash
throw SysError("Failed to exec into %s. Is it in PATH?", execInto);
});
@ -108,7 +112,7 @@ Path SSHMaster::startMaster()
addCommonSSHOpts(args);
execvp(args.begin()->c_str(), stringsToCharPtrs(args).data());
throw SysError("starting SSH master");
throw SysError("Failed to exec into ssh. Is it in PATH?");
});
out.writeSide = -1;