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

Replace a few bool flags with enums

Browse source 
Functions like copyClosure() had 3 bool arguments, which creates a
severe risk of mixing up arguments.

Also, implement copyClosure() using copyPaths().
This commit is contained in:
Eelco Dolstra 2017-06-28 18:11:01 +02:00
parent 90da34e421
commit fcca702a96
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
22 changed files with 144 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/nix-instantiate/nix-instantiate.cc
View file

@ -108,7 +108,7 @@ int main(int argc, char * * argv)
Strings attrPaths;
bool wantsReadWrite = false;
std::map<string, string> autoArgs_;
bool repair = false;
RepairFlag repair = NoRepair;
parseCmdLine(argc, argv, [&](Strings::iterator & arg, const Strings::iterator & end) {
if (*arg == "--help")
@ -146,7 +146,7 @@ int main(int argc, char * * argv)
else if (*arg == "--strict")
strict = true;
else if (*arg == "--repair")
repair = true;
repair = Repair;
else if (*arg == "--dry-run")
settings.readOnlyMode = true;
else if (*arg != "" && arg->at(0) == '-')