Skip to content

Commit 57463ab

Browse files
committed
Inline closureRepaired
1 parent 41274f3 commit 57463ab

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

src/libstore/build/derivation-goal.cc

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -457,18 +457,13 @@ Goal::Co DerivationGoal::repairClosure()
457457
co_return done(BuildResult::AlreadyValid, assertPathValidity());
458458
} else {
459459
co_await Suspend{};
460-
co_return closureRepaired();
461-
}
462-
}
463460

464-
465-
Goal::Co DerivationGoal::closureRepaired()
466-
{
467-
trace("closure repaired");
468-
if (nrFailed > 0)
469-
throw Error("some paths in the output closure of derivation '%s' could not be repaired",
470-
worker.store.printStorePath(drvPath));
471-
co_return done(BuildResult::AlreadyValid, assertPathValidity());
461+
trace("closure repaired");
462+
if (nrFailed > 0)
463+
throw Error("some paths in the output closure of derivation '%s' could not be repaired",
464+
worker.store.printStorePath(drvPath));
465+
co_return done(BuildResult::AlreadyValid, assertPathValidity());
466+
}
472467
}
473468

474469

src/libstore/build/derivation-goal.hh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@ struct DerivationGoal : public Goal
237237
Co loadDerivation();
238238
Co haveDerivation();
239239
Co gaveUpOnSubstitution();
240-
Co closureRepaired();
241240
Co inputsRealised();
242241
Co tryToBuild();
243242
virtual Co tryLocalBuild();

0 commit comments

Comments
 (0)