summaryrefslogtreecommitdiff
path: root/nix/libstore/gc.cc
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-12-15 23:50:24 +0100
committerLudovic Courtès <ludo@gnu.org>2018-12-16 16:28:07 +0100
commit8327e733966cc4a93dfaadd1a761ca1088078baa (patch)
tree3aa6eca1d5f83a394e98657f765439ffd034ec35 /nix/libstore/gc.cc
parent938078a34d06a3053c14c420dfe0430366a8f47b (diff)
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".
Diffstat (limited to 'nix/libstore/gc.cc')
-rw-r--r--nix/libstore/gc.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/nix/libstore/gc.cc b/nix/libstore/gc.cc
index 72eff52426..125f242814 100644
--- a/nix/libstore/gc.cc
+++ b/nix/libstore/gc.cc
@@ -21,7 +21,7 @@ static string tempRootsDir = "temproots";
static string gcRootsDir = "gcroots";
-/* Acquire the global GC lock. This is used to prevent new Nix
+/* Acquire the global GC lock. This is used to prevent new build
processes from starting after the temporary root files have been
read. To be precise: when they try to create a new temporary root
file, they will block until the garbage collector has finished /
@@ -92,12 +92,12 @@ Path addPermRoot(StoreAPI & store, const Path & _storePath,
if (isInStore(gcRoot))
throw Error(format(
- "creating a garbage collector root (%1%) in the Nix store is forbidden "
+ "creating a garbage collector root (%1%) in the store is forbidden "
"(are you running nix-build inside the store?)") % gcRoot);
if (indirect) {
/* Don't clobber the link if it already exists and doesn't
- point to the Nix store. */
+ point to the store. */
if (pathExists(gcRoot) && (!isLink(gcRoot) || !isInStore(readLink(gcRoot))))
throw Error(format("cannot create symlink `%1%'; already exists") % gcRoot);
makeSymlink(gcRoot, storePath);