1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 22:01:15 +02:00

Get rid of unicode quotes (#1140)

This commit is contained in:
Guillaume Maudoux 2016-11-25 15:48:27 +01:00 committed by Domen Kožar
parent 7ee43df862
commit f78126bfd6
96 changed files with 670 additions and 670 deletions

View file

@ -35,7 +35,7 @@ static void writeChannels()
{
auto channelsFD = AutoCloseFD{open(channelsList.c_str(), O_WRONLY | O_CLOEXEC | O_CREAT | O_TRUNC, 0644)};
if (!channelsFD)
throw SysError(format("opening %1% for writing") % channelsList);
throw SysError(format("opening '%1%' for writing") % channelsList);
for (const auto & channel : channels)
writeFull(channelsFD.get(), channel.second + " " + channel.first + "\n");
}
@ -44,9 +44,9 @@ static void writeChannels()
static void addChannel(const string & url, const string & name)
{
if (!regex_search(url, std::regex("^(file|http|https)://")))
throw Error(format("invalid channel URL %1%") % url);
throw Error(format("invalid channel URL '%1%'") % url);
if (!regex_search(name, std::regex("^[a-zA-Z0-9_][a-zA-Z0-9_\\.-]*$")))
throw Error(format("invalid channel identifier %1%") % name);
throw Error(format("invalid channel identifier '%1%'") % name);
readChannels();
channels[name] = url;
writeChannels();
@ -224,7 +224,7 @@ int main(int argc, char ** argv)
throw UsageError("no command specified");
case cAdd:
if (args.size() < 1 || args.size() > 2)
throw UsageError("--add requires one or two arguments");
throw UsageError("'--add' requires one or two arguments");
{
auto url = args[0];
auto name = string{};
@ -240,12 +240,12 @@ int main(int argc, char ** argv)
break;
case cRemove:
if (args.size() != 1)
throw UsageError("--remove requires one argument");
throw UsageError("'--remove' requires one argument");
removeChannel(args[0]);
break;
case cList:
if (!args.empty())
throw UsageError("--list expects no arguments");
throw UsageError("'--list' expects no arguments");
readChannels();
for (const auto & channel : channels)
std::cout << channel.first << ' ' << channel.second << '\n';
@ -255,7 +255,7 @@ int main(int argc, char ** argv)
break;
case cRollback:
if (args.size() > 1)
throw UsageError("--rollback has at most one argument");
throw UsageError("'--rollback' has at most one argument");
auto envArgs = Strings{"--profile", profile};
if (args.size() == 1) {
envArgs.push_back("--switch-generation");