yshui/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Formatting

Browse source
This commit is contained in:
Eelco Dolstra 2021-06-25 15:35:14 +02:00
parent 07790fdddf
commit ceda58d112
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -803,14 +803,14 @@ std::map<StorePath, StorePath> copyPaths(ref<Store> srcStore, ref<Store> dstStor
// Copy the realisation closure // Copy the realisation closure
processGraph<Realisation>( processGraph<Realisation>(
pool, Realisation::closure(*srcStore, toplevelRealisations), pool, Realisation::closure(*srcStore, toplevelRealisations),
[&](const Realisation& current) -> std::set<Realisation> { [&](const Realisation & current) -> std::set<Realisation> {
std::set<Realisation> children; std::set<Realisation> children;
for (const auto& [drvOutput, _] : current.dependentRealisations) { for (const auto & [drvOutput, _] : current.dependentRealisations) {
auto currentChild = srcStore->queryRealisation(drvOutput); auto currentChild = srcStore->queryRealisation(drvOutput);
if (!currentChild) if (!currentChild)
throw Error( throw Error(
"Incomplete realisation closure: '%s' is a " "incomplete realisation closure: '%s' is a "
"dependency of '%s' but isn’t registered", "dependency of '%s' but isn't registered",
drvOutput.to_string(), current.id.to_string()); drvOutput.to_string(), current.id.to_string());
children.insert(*currentChild); children.insert(*currentChild);
} }

2
src/libstore/store-api.hh
View file

@ -762,7 +762,7 @@ std::map<StorePath, StorePath> copyPaths(ref<Store> srcStore, ref<Store> dstStor
CheckSigsFlag checkSigs = CheckSigs, CheckSigsFlag checkSigs = CheckSigs,
SubstituteFlag substitute = NoSubstitute); SubstituteFlag substitute = NoSubstitute);
std::map<StorePath, StorePath> copyPaths(ref<Store> srcStore, ref<Store> dstStore, std::map<StorePath, StorePath> copyPaths(ref<Store> srcStore, ref<Store> dstStore,
const StorePathSet& paths, const StorePathSet & paths,
RepairFlag repair = NoRepair, RepairFlag repair = NoRepair,
CheckSigsFlag checkSigs = CheckSigs, CheckSigsFlag checkSigs = CheckSigs,
SubstituteFlag substitute = NoSubstitute); SubstituteFlag substitute = NoSubstitute);