maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix-store -r: Add ‘--ignore-unknown’ flag

Browse source 
This flag causes paths that do not have a known substitute to be
quietly ignored.  This is mostly useful for Charon, allowing it to
speed up deployment by letting a machine use substitutes for all
substitutable paths, instead of uploading them.  The latter is
frequently faster, e.g. if the target machine has a fast Internet
connection while the source machine is on a slow ADSL line.
This commit is contained in:
Eelco Dolstra 2012-11-20 00:27:25 +01:00
parent bf3725da2a
commit 9de6bc5d05
4 changed files with 44 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/nix-store/nix-store.cc
View file

@ -94,28 +94,44 @@ static void opRealise(Strings opFlags, Strings opArgs)
{
bool dryRun = false;
bool repair = false;
bool ignoreUnknown = false;
foreach (Strings::iterator, i, opFlags)
if (*i == "--dry-run") dryRun = true;
else if (*i == "--repair") repair = true;
else if (*i == "--ignore-unknown") ignoreUnknown = true;
else throw UsageError(format("unknown flag `%1%'") % *i);
Paths paths;
foreach (Strings::iterator, i, opArgs)
*i = followLinksToStorePath(*i);
paths.push_back(followLinksToStorePath(*i));
printMissing(*store, PathSet(opArgs.begin(), opArgs.end()));
unsigned long long downloadSize, narSize;
PathSet willBuild, willSubstitute, unknown;
queryMissing(*store, PathSet(paths.begin(), paths.end()),
willBuild, willSubstitute, unknown, downloadSize, narSize);
if (ignoreUnknown) {
Paths paths2;
foreach (Paths::iterator, i, paths)
if (unknown.find(*i) == unknown.end()) paths2.push_back(*i);
paths = paths2;
unknown = PathSet();
}
printMissing(willBuild, willSubstitute, unknown, downloadSize, narSize);
if (dryRun) return;
/* Build all paths at the same time to exploit parallelism. */
PathSet paths(opArgs.begin(), opArgs.end());
store->buildPaths(paths, repair);
store->buildPaths(PathSet(paths.begin(), paths.end()), repair);
foreach (Paths::iterator, i, opArgs) {
PathSet paths = realisePath(*i, false);
foreach (PathSet::iterator, j, paths)
cout << format("%1%\n") % *j;
}
if (!ignoreUnknown)
foreach (Paths::iterator, i, paths) {
PathSet paths = realisePath(*i, false);
foreach (PathSet::iterator, j, paths)
cout << format("%1%\n") % *j;
}
}