tribes/guix
1
0
Fork 1
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-28 20:12:11 +02:00
Code Activity

daemon: Use unbranded phrases in comments and messages.

Browse Source 
* 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".
This commit is contained in:
Ludovic Courtès
2018-12-15 23:50:24 +01:00
parent 938078a34d
commit 8327e73396
8 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/libstore/store-api.cc
+3 -3
View File
@@ -32,14 +32,14 @@ bool isStorePath(const Path & path)
void assertStorePath(const Path & path)
{
if (!isStorePath(path))
throw Error(format("path `%1%' is not in the Nix store") % path);
throw Error(format("path `%1%' is not in the store") % path);
}
Path toStorePath(const Path & path)
{
if (!isInStore(path))
throw Error(format("path `%1%' is not in the Nix store") % path);
throw Error(format("path `%1%' is not in the store") % path);
Path::size_type slash = path.find('/', settings.nixStore.size() + 1);
if (slash == Path::npos)
return path;
@@ -80,7 +80,7 @@ void checkStoreName(const string & name)
where
<store> = the location of the Nix store, usually /nix/store
<store> = the location of the store, usually /gnu/store
<name> = a human readable name for the path, typically obtained
from the name attribute of the derivation, or the name of the