Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 18f601242c9c
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 749e455f1369
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 20, 2021

  1. Gracefully ignore a substituter if it holds an incompatible realisation

    @thufschmitt
    thufschmitt committed May 20, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    eliottness Eliott Bouhana
    GPG key ID: 5C4DC5A45005B771
    Verified
    Learn about vigilant mode
    Copy the full SHA
    749e455 View commit details
Showing with 9 additions and 0 deletions.
  1. +9 −0 src/libstore/build/drv-output-substitution-goal.cc
9 changes: 9 additions & 0 deletions src/libstore/build/drv-output-substitution-goal.cc
View file
Original file line number Diff line number Diff line change
@@ -53,6 +53,15 @@ void DrvOutputSubstitutionGoal::tryNext()
return;
}

if (auto localOutputInfo = worker.store.queryRealisation(id);
localOutputInfo && !outputInfo->isCompatibleWith(*localOutputInfo)) {
warn(
"Substituter has an incompatible realisation for '%s', ignoring",
id.to_string());
tryNext();
return;
}

for (const auto & drvOutputDep : outputInfo->drvOutputDeps) {
addWaitee(worker.makeDrvOutputSubstitutionGoal(drvOutputDep));
}