yshui/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Don't send eval-related settings to the daemon

Browse source
This commit is contained in:
Eelco Dolstra 2020-11-02 13:57:58 +01:00
parent 035d0adfd8
commit db5424bf09
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/remote-store.cc
View file

@ -11,6 +11,7 @@
#include "finally.hh" #include "finally.hh"
#include "logging.hh" #include "logging.hh"
#include "callback.hh" #include "callback.hh"
#include "filetransfer.hh"
namespace nix { namespace nix {
@ -171,7 +172,8 @@ void RemoteStore::setOptions(Connection & conn)
if (GET_PROTOCOL_MINOR(conn.daemonVersion) >= 12) { if (GET_PROTOCOL_MINOR(conn.daemonVersion) >= 12) {
std::map<std::string, Config::SettingInfo> overrides; std::map<std::string, Config::SettingInfo> overrides;
globalConfig.getSettings(overrides, true); settings.getSettings(overrides, true); // libstore settings
fileTransferSettings.getSettings(overrides, true);
overrides.erase(settings.keepFailed.name); overrides.erase(settings.keepFailed.name);
overrides.erase(settings.keepGoing.name); overrides.erase(settings.keepGoing.name);
overrides.erase(settings.tryFallback.name); overrides.erase(settings.tryFallback.name);