mirror of
https://github.com/NixOS/nix.git
synced 2024-11-22 14:52:55 +00:00
illegal configuration line -> syntax error in configuration line
The law has nothing to do with this, although I do feel like a badass when I mess with the config. I'm a conf artist.
This commit is contained in:
parent
cf3c5cd189
commit
0fe3525223
@ -116,7 +116,7 @@ static void parseConfigFiles(const std::string & contents, const std::string & p
|
||||
if (tokens.empty()) continue;
|
||||
|
||||
if (tokens.size() < 2)
|
||||
throw UsageError("illegal configuration line '%1%' in '%2%'", line, path);
|
||||
throw UsageError("syntax error in configuration line '%1%' in '%2%'", line, path);
|
||||
|
||||
auto include = false;
|
||||
auto ignoreMissing = false;
|
||||
@ -129,7 +129,7 @@ static void parseConfigFiles(const std::string & contents, const std::string & p
|
||||
|
||||
if (include) {
|
||||
if (tokens.size() != 2)
|
||||
throw UsageError("illegal configuration line '%1%' in '%2%'", line, path);
|
||||
throw UsageError("syntax error in configuration line '%1%' in '%2%'", line, path);
|
||||
auto p = absPath(tokens[1], dirOf(path));
|
||||
if (pathExists(p)) {
|
||||
try {
|
||||
@ -145,7 +145,7 @@ static void parseConfigFiles(const std::string & contents, const std::string & p
|
||||
}
|
||||
|
||||
if (tokens[1] != "=")
|
||||
throw UsageError("illegal configuration line '%1%' in '%2%'", line, path);
|
||||
throw UsageError("syntax error in configuration line '%1%' in '%2%'", line, path);
|
||||
|
||||
std::string name = std::move(tokens[0]);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user