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

Remove unused redirectedBadOutputs

Browse source
This commit is contained in:
John Ericson 2021-02-24 17:38:38 +00:00
parent d560311f76
commit 553b79f8c9
2 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/build/local-derivation-goal.cc
View file

@ -460,10 +460,6 @@ void LocalDerivationGoal::startBuilder()
makeFallbackPath(status.known->path); makeFallbackPath(status.known->path);
scratchOutputs.insert_or_assign(outputName, scratchPath); scratchOutputs.insert_or_assign(outputName, scratchPath);
/* A non-removed corrupted path needs to be stored here, too */
if (buildMode == bmRepair && !status.known->isValid())
redirectedBadOutputs.insert(status.known->path);
/* Substitute output placeholders with the scratch output paths. /* Substitute output placeholders with the scratch output paths.
We'll use during the build. */ We'll use during the build. */
inputRewrites[hashPlaceholder(outputName)] = worker.store.printStorePath(scratchPath); inputRewrites[hashPlaceholder(outputName)] = worker.store.printStorePath(scratchPath);

5
src/libstore/build/local-derivation-goal.hh
View file

@ -85,11 +85,6 @@ struct LocalDerivationGoal : public DerivationGoal
*/ */
OutputPathMap scratchOutputs; OutputPathMap scratchOutputs;
/* If we're repairing without a chroot, there may be outputs that
are valid but corrupt. So we redirect these outputs to
temporary paths. */
StorePathSet redirectedBadOutputs;
/* Path registration info from the previous round, if we're /* Path registration info from the previous round, if we're
building multiple times. Since this contains the hash, it building multiple times. Since this contains the hash, it
allows us to compare whether two rounds produced the same allows us to compare whether two rounds produced the same