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

Split comment, match with each variable

Browse source
This commit is contained in:
John Ericson 2023-05-08 10:08:01 -04:00
parent cd0d8e0bd5
commit df53a7d268
1 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -291,32 +291,19 @@ connected:
std::optional<BuildResult> optResult; std::optional<BuildResult> optResult;
// Let's break this down
//
// ### Trust part
//
// ```
// std::optional trust = sshStore->isTrustedClient(); (!trust || *trust)
// ```
//
// If we don't know whether we are trusted (e.g. `ssh://` // If we don't know whether we are trusted (e.g. `ssh://`
// stores), we assume we are. This is necessary for backwards // stores), we assume we are. This is necessary for backwards
// compat. // compat.
// bool trustedOrLegacy = ({
// ### Content-addressing part std::optional trusted = sshStore->isTrustedClient();
// !trusted || *trusted;
// ``` });
// ...trustCond... || drv.type().isCA()
// ```
//
// 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" outlined there; // 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".
std::optional trusted = sshStore->isTrustedClient();
// for backward compatibility (use existing comments here)
bool trustedOrLegacy = !trusted || *trusted;
if (trustedOrLegacy || drv.type().isCA()) { 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