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

Apply suggestions from code review

Browse source 
Thanks!

Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
This commit is contained in:
John Ericson 2020-09-04 10:48:50 -04:00 committed by GitHub
parent c9f1ed912c
commit e86dd59dcc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/build.cc
View file

@ -1266,7 +1266,7 @@ void DerivationGoal::haveDerivation()
for (auto & [_, status] : initialOutputs) { for (auto & [_, status] : initialOutputs) {
if (!status.wanted) continue; if (!status.wanted) continue;
if (!status.known) { if (!status.known) {
warn("Do not know how to query for unknown floating CA drv output yet"); warn("do not know how to query for unknown floating content-addressed derivation output yet");
/* Nothing to wait for; tail call */ /* Nothing to wait for; tail call */
return DerivationGoal::gaveUpOnSubstitution(); return DerivationGoal::gaveUpOnSubstitution();
} }
@ -1463,7 +1463,7 @@ void DerivationGoal::inputsRealised()
auto optRealizedInput = outputs.at(j); auto optRealizedInput = outputs.at(j);
if (!optRealizedInput) if (!optRealizedInput)
throw Error( throw Error(
"derivation '%s' requires output '%s' from input derivation '%s', which is supposedly realized already, yet we still don't know what path corresponds to that output.", "derivation '%s' requires output '%s' from input derivation '%s', which is supposedly realized already, yet we still don't know what path corresponds to that output",
worker.store.printStorePath(drvPath), j, worker.store.printStorePath(drvPath)); worker.store.printStorePath(drvPath), j, worker.store.printStorePath(drvPath));
worker.store.computeFSClosure(*optRealizedInput, inputPaths); worker.store.computeFSClosure(*optRealizedInput, inputPaths);
} else } else
@ -2032,7 +2032,7 @@ StorePathSet DerivationGoal::exportReferences(const StorePathSet & storePaths)
`computeFSClosure` on the output path, rather than `computeFSClosure` on the output path, rather than
derivation itself. That doesn't seem right to me, so I derivation itself. That doesn't seem right to me, so I
won't try to implemented this for CA derivations. */ won't try to implemented this for CA derivations. */
throw UnimplementedError("export references including CA derivations (themselves) is not yet implemented"); throw UnimplementedError("exportReferences on CA derivations is not yet implemented");
worker.store.computeFSClosure(*k.second.second, paths); worker.store.computeFSClosure(*k.second.second, paths);
} }
} }
@ -2175,7 +2175,7 @@ void DerivationGoal::startBuilder()
differ. */ differ. */
if (fixedFinalPath == scratchPath) continue; if (fixedFinalPath == scratchPath) continue;
/* Ensure scratch scratch path is ours to use */ /* Ensure scratch path is ours to use. */
deletePath(worker.store.printStorePath(scratchPath)); deletePath(worker.store.printStorePath(scratchPath));
/* Rewrite and unrewrite paths */ /* Rewrite and unrewrite paths */