aboutsummaryrefslogtreecommitdiff
path: root/src/nix-store
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-04-13 20:53:23 +0200
committerEelco Dolstra <edolstra@gmail.com>2017-04-13 20:53:23 +0200
commitba9ad29fdbfda3836bb06b35817f08fd10beaa22 (patch)
tree565646143793af4e91ee88630e667bb7976e8686 /src/nix-store
parent6bd9576aeb55927cb551736a47b4e8e3fd1063bb (diff)
Convert Settings to the new config system
This makes all config options self-documenting. Unknown or unparseable config settings and --option flags now cause a warning.
Diffstat (limited to 'src/nix-store')
-rw-r--r--src/nix-store/nix-store.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index a40cca982..9131b74df 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -795,11 +795,11 @@ static void opServe(Strings opFlags, Strings opArgs)
settings.maxSilentTime = readInt(in);
settings.buildTimeout = readInt(in);
if (GET_PROTOCOL_MINOR(clientVersion) >= 2)
- in >> settings.maxLogSize;
+ settings.maxLogSize = readNum<unsigned long>(in);
if (GET_PROTOCOL_MINOR(clientVersion) >= 3) {
- settings.set("build-repeat", std::to_string(readInt(in)));
- settings.set("enforce-determinism", readInt(in) != 0 ? "true" : "false");
- settings.set("run-diff-hook", "true");
+ settings.buildRepeat = readInt(in);
+ settings.enforceDeterminism = readInt(in);
+ settings.runDiffHook = readInt(in);
}
settings.printRepeatedBuilds = false;
};