diff options
Diffstat (limited to 'third_party/nix/src/libstore/remote-store.cc')
| -rw-r--r-- | third_party/nix/src/libstore/remote-store.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/third_party/nix/src/libstore/remote-store.cc b/third_party/nix/src/libstore/remote-store.cc index 7570255330..7c4f3a138f 100644 --- a/third_party/nix/src/libstore/remote-store.cc +++ b/third_party/nix/src/libstore/remote-store.cc @@ -19,7 +19,6 @@ #include "libutil/archive.hh" #include "libutil/finally.hh" #include "libutil/pool.hh" -#include "libutil/prefork-compat.hh" #include "libutil/serialise.hh" #include "libutil/util.hh" @@ -167,14 +166,11 @@ void RemoteStore::initConnection(Connection& conn) { void RemoteStore::setOptions(Connection& conn) { conn.to << wopSetOptions << static_cast<uint64_t>(settings.keepFailed) << static_cast<uint64_t>(settings.keepGoing) - // TODO(tazjin): Remove the verbosity stuff here. - << static_cast<uint64_t>(settings.tryFallback) << compat::kInfo - << settings.maxBuildJobs << settings.maxSilentTime - << 1u - // TODO(tazjin): what behaviour does this toggle remotely? - << (settings.verboseBuild ? compat::kError : compat::kVomit) - << 0 // obsolete log type - << 0 /* obsolete print build trace */ + << static_cast<uint64_t>(settings.tryFallback) + << /* previously: verbosity = */ 0 << settings.maxBuildJobs + << settings.maxSilentTime << 1u + << /* previously: remote verbosity = */ 0 << 0 // obsolete log type + << 0 /* obsolete print build trace */ << settings.buildCores << static_cast<uint64_t>(settings.useSubstitutes); |