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

Fix tests on systems with a non-master git defaultBranch #1

Open
zebreus wants to merge 140 commits from fix-tests-without-master into main
pull from: fix-tests-without-master
merge into: zebreus:main
Conversation 0 Commits 140 Files changed 216 +1 -17
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit dc0cace604 - Show all commits

18
src/libstore/build/worker.cc
View file

@ -344,7 +344,6 @@ void Worker::updateStatistics()
Goals Worker::run(std::function<Goals (GoalFactory &)> req) Goals Worker::run(std::function<Goals (GoalFactory &)> req)
{ {
auto _topGoals = req(goalFactory()); auto _topGoals = req(goalFactory());
std::vector<nix::DerivedPath> topPaths;
assert(!running); assert(!running);
running = true; running = true;
@ -352,22 +351,7 @@ Goals Worker::run(std::function<Goals (GoalFactory &)> req)
updateStatistics(); updateStatistics();
for (auto & i : _topGoals) { topGoals = _topGoals;
topGoals.insert(i);
if (auto goal = dynamic_cast<DerivationGoal *>(i.get())) {
topPaths.push_back(DerivedPath::Built {
.drvPath = makeConstantStorePathRef(goal->drvPath),
.outputs = goal->wantedOutputs,
});
} else if (auto goal = dynamic_cast<PathSubstitutionGoal *>(i.get())) {
topPaths.push_back(DerivedPath::Opaque{goal->storePath});
}
}
/* Call queryMissing() to efficiently query substitutes. */
StorePathSet willBuild, willSubstitute, unknown;
uint64_t downloadSize, narSize;
store.queryMissing(topPaths, willBuild, willSubstitute, unknown, downloadSize, narSize);
debug("entered goal loop"); debug("entered goal loop");