cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Apply suggestions from code review

Browse source 
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
This commit is contained in:
John Ericson 2023-05-08 09:57:05 -04:00 committed by GitHub
parent ab5ca608bf
commit cd0d8e0bd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/build-remote/build-remote.cc
View file

@ -312,9 +312,12 @@ connected:
// See the very large comment in `case wopBuildDerivation:` in // See the very large comment in `case wopBuildDerivation:` in
// `src/libstore/daemon.cc` that explains the trust model here. // `src/libstore/daemon.cc` that explains the trust model here.
// //
// This condition mirrors that: that code enforces the "rules"; // This condition mirrors that: that code enforces the "rules" outlined there;
// we do the best we can given those "rules". // we do the best we can given those "rules".
if (std::optional trust = sshStore->isTrustedClient(); (!trust || *trust) || drv.type().isCA()) { std::optional trusted = sshStore->isTrustedClient();
// for backward compatibility (use existing comments here)
bool trustedOrLegacy = !trusted || *trusted;
if (trustedOrLegacy || drv.type().isCA()) {
// Hijack the inputs paths of the derivation to include all // Hijack the inputs paths of the derivation to include all
// the paths that come from the `inputDrvs` set. We don’t do // the paths that come from the `inputDrvs` set. We don’t do
// that for the derivations whose `inputDrvs` is empty // that for the derivations whose `inputDrvs` is empty
@ -331,9 +334,9 @@ connected:
if (!result.success()) if (!result.success())
throw Error("build of '%s' on '%s' failed: %s", store->printStorePath(*drvPath), storeUri, result.errorMsg); throw Error("build of '%s' on '%s' failed: %s", store->printStorePath(*drvPath), storeUri, result.errorMsg);
} else { } else {
copyPaths(*store, *sshStore, StorePathSet {*drvPath}, NoRepair, NoCheckSigs, substitute); copyClosure(*store, *sshStore, StorePathSet {*drvPath}, NoRepair, NoCheckSigs, substitute);
auto res = sshStore->buildPathsWithResults({ DerivedPath::Built { *drvPath, OutputsSpec::All {} } }); auto res = sshStore->buildPathsWithResults({ DerivedPath::Built { *drvPath, OutputsSpec::All {} } });
// One path to build should mean one result back // One path to build should produce exactly one build result
assert(res.size() == 1); assert(res.size() == 1);
optResult = std::move(res[0]); optResult = std::move(res[0]);
} }