wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 02:11: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

6
src/nix-copy-closure/nix-copy-closure.cc
View file

@ -12,7 +12,7 @@ int main(int argc, char ** argv)
auto toMode = true;
auto includeOutputs = false;
auto dryRun = false;
auto useSubstitutes = false;
auto useSubstitutes = NoSubstitute;
std::string sshHost;
PathSet storePaths;
@ -36,7 +36,7 @@ int main(int argc, char ** argv)
else if (*arg == "--dry-run")
dryRun = true;
else if (*arg == "--use-substitutes" || *arg == "-s")
useSubstitutes = true;
useSubstitutes = Substitute;
else if (sshHost.empty())
sshHost = *arg;
else
@ -58,6 +58,6 @@ int main(int argc, char ** argv)
PathSet closure;
from->computeFSClosure(storePaths2, closure, false, includeOutputs);
copyPaths(from, to, closure, useSubstitutes, true);
copyPaths(from, to, closure, NoRepair, NoCheckSigs, useSubstitutes);
});
}