nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2019-06-12 23:11:37 +02:00
parent bd9b15fb31
commit 76533c52c0
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nix/libstore/build.cc
View File

@ -2348,7 +2348,7 @@ PathSet parseReferenceSpecifiers(const Derivation & drv, string attr)
else if (drv.outputs.find(*i) != drv.outputs.end()) else if (drv.outputs.find(*i) != drv.outputs.end())
result.insert(drv.outputs.find(*i)->second.path); result.insert(drv.outputs.find(*i)->second.path);
else throw BuildError( else throw BuildError(
format("derivation contains an illegal reference specifier `%1%'") format("derivation contains an invalid reference specifier `%1%'")
% *i); % *i);
} }
return result; return result;

2
nix/libstore/globals.cc
View File

@ -196,7 +196,7 @@ string Settings::pack()
if (i->first.find('\n') != string::npos || if (i->first.find('\n') != string::npos ||
i->first.find('=') != string::npos || i->first.find('=') != string::npos ||
i->second.find('\n') != 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'; s += i->first; s += '='; s += i->second; s += '\n';
} }
return s; return s;

2
nix/libstore/store-api.cc
View File

@ -61,7 +61,7 @@ void checkStoreName(const string & name)
/* Disallow names starting with a dot for possible security /* Disallow names starting with a dot for possible security
reasons (e.g., "." and ".."). */ reasons (e.g., "." and ".."). */
if (string(name, 0, 1) == ".") 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) foreach (string::const_iterator, i, name)
if (!((*i >= 'A' && *i <= 'Z') || if (!((*i >= 'A' && *i <= 'Z') ||
(*i >= 'a' && *i <= 'z') || (*i >= 'a' && *i <= 'z') ||