summaryrefslogtreecommitdiff
path: root/nix/libstore
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-06-12 23:11:37 +0200
committerLudovic Courtès <ludo@gnu.org>2019-06-13 00:44:01 +0200
commit76533c52c06de4823738b32e450a1a06522018d1 (patch)
tree777d0a1d5dc8001ed4133ef1f8a4fc6b368cea01 /nix/libstore
parentbd9b15fb31f36f0d592b777bc95205eb0b037035 (diff)
daemon: Replace "illegal" by "invalid" in error messages.
* nix/libstore/build.cc (parseReferenceSpecifiers): Replace "illegal" by "invalid". * nix/libstore/globals.cc (Settings::pack): Likewise. * nix/libstore/store-api.cc (checkStoreName): Likewise.
Diffstat (limited to 'nix/libstore')
-rw-r--r--nix/libstore/build.cc2
-rw-r--r--nix/libstore/globals.cc2
-rw-r--r--nix/libstore/store-api.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index 06bc7601b9..fe7bf79069 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -2348,7 +2348,7 @@ PathSet parseReferenceSpecifiers(const Derivation & drv, string attr)
else if (drv.outputs.find(*i) != drv.outputs.end())
result.insert(drv.outputs.find(*i)->second.path);
else throw BuildError(
- format("derivation contains an illegal reference specifier `%1%'")
+ format("derivation contains an invalid reference specifier `%1%'")
% *i);
}
return result;
diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc
index 69f6d06563..6df20e7a52 100644
--- a/nix/libstore/globals.cc
+++ b/nix/libstore/globals.cc
@@ -196,7 +196,7 @@ string Settings::pack()
if (i->first.find('\n') != string::npos ||
i->first.find('=') != string::npos ||
i->second.find('\n') != string::npos)
- throw Error("illegal option name/value");
+ throw Error("invalid option name/value");
s += i->first; s += '='; s += i->second; s += '\n';
}
return s;
diff --git a/nix/libstore/store-api.cc b/nix/libstore/store-api.cc
index 709d17ea21..0de0b6b298 100644
--- a/nix/libstore/store-api.cc
+++ b/nix/libstore/store-api.cc
@@ -61,7 +61,7 @@ void checkStoreName(const string & name)
/* Disallow names starting with a dot for possible security
reasons (e.g., "." and ".."). */
if (string(name, 0, 1) == ".")
- throw Error(format("illegal name: `%1%'") % name);
+ throw Error(format("invalid name: `%1%'") % name);
foreach (string::const_iterator, i, name)
if (!((*i >= 'A' && *i <= 'Z') ||
(*i >= 'a' && *i <= 'z') ||