From 8327e733966cc4a93dfaadd1a761ca1088078baa Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 15 Dec 2018 23:50:24 +0100 Subject: daemon: Use unbranded phrases in comments and messages. * nix/libstore/build.cc, nix/libstore/globals.cc, nix/libstore/gc.cc, nix/libstore/local-store.cc, nix/libstore/optimise-store.cc, nix/libstore/store-api.cc, nix/libutil/archive.cc, nix/nix-daemon/nix-daemon.cc: Replace "Nix store" by "store", and "Nix daemon" by "build daemon". --- nix/nix-daemon/nix-daemon.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nix/nix-daemon') diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc index 6ce475a26c..56137701a1 100644 --- a/nix/nix-daemon/nix-daemon.cc +++ b/nix/nix-daemon/nix-daemon.cc @@ -474,7 +474,7 @@ static void performOp(bool trusted, unsigned int clientVersion, /* Repairing is not atomic, so disallowed for "untrusted" clients. */ if (mode == bmRepair && !trusted) - throw Error("repairing is not supported when building through the Nix daemon"); + throw Error("repairing is a privileged operation"); } startWork(); store->buildPaths(drvs, mode); @@ -801,7 +801,7 @@ static void processConnection(bool trusted) stopWork(false, e.msg(), GET_PROTOCOL_MINOR(clientVersion) >= 8 ? e.status : 0); if (!errorAllowed) throw; } catch (std::bad_alloc & e) { - stopWork(false, "Nix daemon out of memory", GET_PROTOCOL_MINOR(clientVersion) >= 8 ? 1 : 0); + stopWork(false, "build daemon out of memory", GET_PROTOCOL_MINOR(clientVersion) >= 8 ? 1 : 0); throw; } @@ -955,7 +955,7 @@ static void acceptConnection(int fdSocket) processConnection(trusted); exit(0); - }, false, "unexpected Nix daemon error: ", true); + }, false, "unexpected build daemon error: ", true); } catch (Interrupted & e) { throw; -- cgit v1.2.3