nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 23:42:43 +01:00
Code Activity

Pass all --option flags to the daemon

Browse source
This commit is contained in:
Eelco Dolstra 2012-07-31 18:19:44 -04:00
parent 89a8207029
commit 90d9c58d4d
4 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -184,6 +184,7 @@ RemoteStore::~RemoteStore()
void RemoteStore::setOptions()
{
writeInt(wopSetOptions, to);
writeInt(settings.keepFailed, to);
writeInt(settings.keepGoing, to);
writeInt(settings.tryFallback, to);
@ -202,6 +203,15 @@ void RemoteStore::setOptions()
if (GET_PROTOCOL_MINOR(daemonVersion) >= 10)
writeInt(settings.useSubstitutes, to);
if (GET_PROTOCOL_MINOR(daemonVersion) >= 12) {
Settings::SettingsMap overrides = settings.getOverrides();
writeInt(overrides.size(), to);
foreach (Settings::SettingsMap::iterator, i, overrides) {
writeString(i->first, to);
writeString(i->second, to);
}
}
processStderr();
}