diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2020-07-03 16:27:39 +0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2020-07-03 16:27:39 +0200 |
commit | 14227aeb327798a1446ddde59fc561c3d2e6b7a8 (patch) | |
tree | 72acb28cf81132b2da3d5c8c6dc88cbeeff84692 /src/libstore/remote-store.cc | |
parent | c3c7aedbb5ac869b7c454e90683f77b9c527a75a (diff) | |
parent | b29a4ea1dc650725d7489ecc9dd54ed37446d20f (diff) |
Merge branch 'add-trace' of https://github.com/bburdette/nix
Diffstat (limited to 'src/libstore/remote-store.cc')
-rw-r--r-- | src/libstore/remote-store.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index 8c648d671..118aadf7e 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -8,6 +8,7 @@ #include "derivations.hh" #include "pool.hh" #include "finally.hh" +#include "logging.hh" #include <sys/types.h> #include <sys/stat.h> @@ -220,7 +221,7 @@ void RemoteStore::setOptions(Connection & conn) overrides.erase(settings.maxSilentTime.name); overrides.erase(settings.buildCores.name); overrides.erase(settings.useSubstitutes.name); - overrides.erase(settings.showTrace.name); + overrides.erase(loggerSettings.showTrace.name); conn.to << overrides.size(); for (auto & i : overrides) conn.to << i.first << i.second.value; |