From 8a8805b172e84711333cb613572b46103b27af02 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 17 Jul 2019 13:35:32 +0200 Subject: [PATCH] libstore: ssh-ng: forward the default setOptions Without these options it's not possible to forward build timeout options for example. The TODO is probably applicable to all the remote stores. --- src/libstore/remote-store.cc | 6 ++++++ src/libstore/ssh-store.cc | 10 ---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index 15faf78a526..9eddf94493b 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -172,6 +172,12 @@ void RemoteStore::initConnection(Connection & conn) } +/* TODO Add a way to explicitly ask for some options to be + forwarded. One option: A way to query the daemon for its + settings, and then a series of params to SSHStore like + forward-cores or forward-overridden-cores that only + override the requested settings. +*/ void RemoteStore::setOptions(Connection & conn) { conn.to << wopSetOptions diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc index 39205ae2ce1..0c70bca33fc 100644 --- a/src/libstore/ssh-store.cc +++ b/src/libstore/ssh-store.cc @@ -51,16 +51,6 @@ class SSHStore : public RemoteStore std::string host; SSHMaster master; - - void setOptions(RemoteStore::Connection & conn) override - { - /* TODO Add a way to explicitly ask for some options to be - forwarded. One option: A way to query the daemon for its - settings, and then a series of params to SSHStore like - forward-cores or forward-overridden-cores that only - override the requested settings. - */ - }; }; void SSHStore::narFromPath(const Path & path, Sink & sink)