wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 09:31:16 +02:00
Code Activity

nix-copy-closure: Implement in C++.

Browse source 
Tests fail currently because the database is not given proper hashes in the VM
This commit is contained in:
Shea Levy 2016-08-10 10:44:39 -04:00
parent 8af062f372
commit bfa41eb671
11 changed files with 100 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/ssh-store.cc
View file

@ -39,6 +39,8 @@ private:
string uri;
Path key;
bool compress;
};
SSHStore::SSHStore(string uri, const Params & params, size_t maxConnections)
@ -48,6 +50,7 @@ SSHStore::SSHStore(string uri, const Params & params, size_t maxConnections)
, socketPath((Path) tmpDir + "/ssh.sock")
, uri(std::move(uri))
, key(get(params, "ssh-key", ""))
, compress(get(params, "compress", "") == "true")
{
/* open a connection and perform the handshake to verify all is well */
connections->get();
@ -90,11 +93,12 @@ ref<FSAccessor> SSHStore::getFSAccessor()
ref<RemoteStore::Connection> SSHStore::openConnection()
{
if ((pid_t) sshMaster == -1) {
auto flags = compress ? "-NMCS" : "-NMS";
sshMaster = startProcess([&]() {
if (key.empty())
execlp("ssh", "ssh", "-N", "-M", "-S", socketPath.c_str(), uri.c_str(), NULL);
execlp("ssh", "ssh", flags, socketPath.c_str(), uri.c_str(), NULL);
else
execlp("ssh", "ssh", "-N", "-M", "-S", socketPath.c_str(), "-i", key.c_str(), uri.c_str(), NULL);
execlp("ssh", "ssh", flags, socketPath.c_str(), "-i", key.c_str(), uri.c_str(), NULL);
throw SysError("starting ssh master");
});
}