wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 17:51:15 +02:00
Code Activity

fixes to merged code

Browse source
This commit is contained in:
Ben Burdette 2020-05-11 15:52:15 -06:00
parent 59b1f5c701
commit b93c1bf3d6
13 changed files with 29 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libutil/args.cc
View file

@ -101,15 +101,8 @@ bool Args::processFlag(Strings::iterator & pos, Strings::iterator end)
std::vector<std::string> args;
for (size_t n = 0 ; n < flag.handler.arity; ++n) {
if (pos == end) {
<<<<<<< HEAD
if (flag.arity == ArityAny) break;
throw UsageError("flag '%1%' requires %2% argument(s)",
name,
flag.arity);
=======
if (flag.handler.arity == ArityAny) break;
throw UsageError("flag '%s' requires %d argument(s)", name, flag.handler.arity);
>>>>>>> master
}
args.push_back(*pos++);
}