wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 08:31:16 +02:00
Code Activity

Merge branch 'nix-copy-closure-c++' of https://github.com/shlevy/nix

Browse source
This commit is contained in:
Eelco Dolstra 2017-02-07 20:47:45 +01:00
commit 6f4682ad36
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
11 changed files with 97 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/libstore/store-api.cc
View file

@ -5,6 +5,7 @@
#include "nar-info-disk-cache.hh"
#include "thread-pool.hh"
#include "json.hh"
#include "derivations.hh"
#include <future>
@ -780,8 +781,27 @@ std::list<ref<Store>> getDefaultSubstituters()
}
void copyPaths(ref<Store> from, ref<Store> to, const Paths & storePaths)
void copyPaths(ref<Store> from, ref<Store> to, const Paths & storePaths, bool substitute)
{
if (substitute) {
/* Filter out .drv files (we don't want to build anything). */
PathSet paths2;
for (auto & path : storePaths)
if (!isDerivation(path)) paths2.insert(path);
unsigned long long downloadSize, narSize;
PathSet willBuild, willSubstitute, unknown;
to->queryMissing(PathSet(paths2.begin(), paths2.end()),
willBuild, willSubstitute, unknown, downloadSize, narSize);
/* FIXME: should use ensurePath(), but it only
does one path at a time. */
if (!willSubstitute.empty())
try {
to->buildPaths(willSubstitute);
} catch (Error & e) {
printMsg(lvlError, format("warning: %1%") % e.msg());
}
}
std::string copiedLabel = "copied";
logger->setExpected(copiedLabel, storePaths.size());