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

Use buildPathsWithResults in build-remote.cc trustless path

Browse source 
It handles failures more correctly; I am glad we have it now!
This commit is contained in:
John Ericson 2023-04-17 09:59:14 -04:00
parent 79ba0ba37a
commit 23ee2d79a9
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -332,7 +332,10 @@ connected:
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); copyPaths(*store, *sshStore, StorePathSet {*drvPath}, NoRepair, NoCheckSigs, substitute);
sshStore->buildPaths({ DerivedPath::Built { *drvPath, OutputsSpec::All {} } }); auto res = sshStore->buildPathsWithResults({ DerivedPath::Built { *drvPath, OutputsSpec::All {} } });
// One path to build should mean one result back
assert(res.size() == 1);
optResult = std::move(res[0]);
} }