diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-12-15 23:50:24 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-12-16 16:28:07 +0100 |
| commit | 8327e733966cc4a93dfaadd1a761ca1088078baa (patch) | |
| tree | 3aa6eca1d5f83a394e98657f765439ffd034ec35 /nix/libstore/store-api.cc | |
| parent | 938078a34d06a3053c14c420dfe0430366a8f47b (diff) | |
| download | patches-8327e733966cc4a93dfaadd1a761ca1088078baa.tar patches-8327e733966cc4a93dfaadd1a761ca1088078baa.tar.gz | |
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/store-api.cc')
| -rw-r--r-- | nix/libstore/store-api.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nix/libstore/store-api.cc b/nix/libstore/store-api.cc index 9e07c67e97..709d17ea21 100644 --- a/nix/libstore/store-api.cc +++ b/nix/libstore/store-api.cc @@ -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 |