lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Clean up toDerivedPaths() logic

Browse source
This commit is contained in:
Eelco Dolstra 2023-01-10 15:08:46 +01:00
parent 1123c42f90
commit 7f1af270dd
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/libcmd/installables.cc
View file

@ -478,11 +478,9 @@ struct InstallableAttrPath : InstallableValue
DrvInfos drvInfos; DrvInfos drvInfos;
getDerivations(*state, *v, "", autoArgs, drvInfos, false); getDerivations(*state, *v, "", autoArgs, drvInfos, false);
DerivedPathsWithInfo res;
// Backward compatibility hack: group results by drvPath. This // Backward compatibility hack: group results by drvPath. This
// helps keep .all output together. // helps keep .all output together.
std::map<StorePath, size_t> byDrvPath; std::map<StorePath, DerivedPath::Built> byDrvPath;
for (auto & drvInfo : drvInfos) { for (auto & drvInfo : drvInfos) {
auto drvPath = drvInfo.queryDrvPath(); auto drvPath = drvInfo.queryDrvPath();
@ -497,21 +495,16 @@ struct InstallableAttrPath : InstallableValue
for (auto & output : drvInfo.queryOutputs(false, std::get_if<DefaultOutputs>(&outputsSpec))) for (auto & output : drvInfo.queryOutputs(false, std::get_if<DefaultOutputs>(&outputsSpec)))
outputsToInstall.insert(output.first); outputsToInstall.insert(output.first);
auto i = byDrvPath.find(*drvPath); auto derivedPath = byDrvPath.emplace(*drvPath, DerivedPath::Built { .drvPath = *drvPath }).first;
if (i == byDrvPath.end()) {
byDrvPath[*drvPath] = res.size(); for (auto & output : outputsToInstall)
res.push_back({ derivedPath->second.outputs.insert(output);
.path = DerivedPath::Built {
.drvPath = std::move(*drvPath),
.outputs = std::move(outputsToInstall),
}
});
} else {
for (auto & output : outputsToInstall)
std::get<DerivedPath::Built>(res[i->second].path).outputs.insert(output);
}
} }
DerivedPathsWithInfo res;
for (auto & [_, info] : byDrvPath)
res.push_back({ .path = { info } });
return res; return res;
} }
}; };