Befator-Inc-Firmen-Netzwerk/nix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inline closureRepaired

Browse Source
This commit is contained in:
John Ericson
2025-02-01 18:36:58 -05:00
parent 41274f3c3e
commit 57463ab910
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libstore/build/derivation-goal.cc
View File

@@ -457,21 +457,16 @@ Goal::Co DerivationGoal::repairClosure()
co_return done(BuildResult::AlreadyValid, assertPathValidity());
} else {
co_await Suspend{};
co_return closureRepaired();
trace("closure repaired");
if (nrFailed > 0)
throw Error("some paths in the output closure of derivation '%s' could not be repaired",
worker.store.printStorePath(drvPath));
co_return done(BuildResult::AlreadyValid, assertPathValidity());
}
}
Goal::Co DerivationGoal::closureRepaired()
{
trace("closure repaired");
if (nrFailed > 0)
throw Error("some paths in the output closure of derivation '%s' could not be repaired",
worker.store.printStorePath(drvPath));
co_return done(BuildResult::AlreadyValid, assertPathValidity());
}
Goal::Co DerivationGoal::inputsRealised()
{
trace("all inputs realised");

1
src/libstore/build/derivation-goal.hh
View File

@@ -237,7 +237,6 @@ struct DerivationGoal : public Goal
Co loadDerivation();
Co haveDerivation();
Co gaveUpOnSubstitution();
Co closureRepaired();
Co inputsRealised();
Co tryToBuild();
virtual Co tryLocalBuild();