diff options
author | Ludovic Courtès <ludo@gnu.org> | 2018-12-20 18:39:04 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2018-12-20 18:39:04 +0100 |
commit | 86974d8a9247cbeb938b5202f23ccca8d9ed627d (patch) | |
tree | 7bd498ccf672aced617aa24a830ec4164268c03f /nix/libstore/store-api.cc | |
parent | 03a45a40227d97ccafeb49c4eb0fc7539f4d2127 (diff) | |
parent | 9012d226fa46229a84e49a42c9b6d287105dfddf (diff) | |
download | guix-patches-86974d8a9247cbeb938b5202f23ccca8d9ed627d.tar guix-patches-86974d8a9247cbeb938b5202f23ccca8d9ed627d.tar.gz |
Merge branch 'master' into core-updates
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 |