From 4dbbd721eb9db75d4968a624b8cb9e75e979a144 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Mon, 2 Sep 2024 20:09:35 +0200 Subject: treewide: consistently mark overridden settings as such Only overridden settings are sent to the daemon, and we're going to do the same for the build hook to. It needs to be ensured that overridden settings are in fact consistently marked as such, so that they actually get sent. Change-Id: I7cd58d925702f86cf2c35ad121eb191ceb62a355 --- src/legacy/nix-store.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/legacy/nix-store.cc') diff --git a/src/legacy/nix-store.cc b/src/legacy/nix-store.cc index e42aa4065..d4742f61f 100644 --- a/src/legacy/nix-store.cc +++ b/src/legacy/nix-store.cc @@ -831,12 +831,12 @@ static void opServe(Strings opFlags, Strings opArgs) // FIXME: changing options here doesn't work if we're // building through the daemon. verbosity = lvlError; - settings.keepLog = false; - settings.useSubstitutes = false; - settings.maxSilentTime = readInt(in); - settings.buildTimeout = readInt(in); + settings.keepLog.override(false); + settings.useSubstitutes.override(false); + settings.maxSilentTime.override(readInt(in)); + settings.buildTimeout.override(readInt(in)); if (GET_PROTOCOL_MINOR(clientVersion) >= 2) - settings.maxLogSize = readNum(in); + settings.maxLogSize.override(readNum(in)); if (GET_PROTOCOL_MINOR(clientVersion) >= 3) { auto nrRepeats = readInt(in); if (nrRepeats != 0) { @@ -850,10 +850,10 @@ static void opServe(Strings opFlags, Strings opArgs) // asked for. readInt(in); - settings.runDiffHook = true; + settings.runDiffHook.override(true); } if (GET_PROTOCOL_MINOR(clientVersion) >= 7) { - settings.keepFailed = (bool) readInt(in); + settings.keepFailed.override((bool) readInt(in)); } }; -- cgit v1.2.3