nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-30 02:32:26 +00:00
Code Issues Packages Projects 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 2021-01-22 10:21:12 -05:00
parent 8c07ed1dda
commit 53a709535b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/build-remote/build-remote.cc
View File

@ -75,11 +75,11 @@ static int main_build_remote(int argc, char * * argv)
/* It would be more appropriate to use $XDG_RUNTIME_DIR, since /* It would be more appropriate to use $XDG_RUNTIME_DIR, since
that gets cleared on reboot, but it wouldn't work on macOS. */ that gets cleared on reboot, but it wouldn't work on macOS. */
currentLoad = "/current-load"; auto currentLoadName = "/current-load";
if (auto localStore = store.dynamic_pointer_cast<LocalFSStore>()) if (auto localStore = store.dynamic_pointer_cast<LocalFSStore>())
currentLoad = std::string { localStore->stateDir } + currentLoad; currentLoad = std::string { localStore->stateDir } + currentLoadName;
else else
currentLoad = settings.nixStateDir + currentLoad; currentLoad = settings.nixStateDir + currentLoadName;
std::shared_ptr<Store> sshStore; std::shared_ptr<Store> sshStore;
AutoCloseFD bestSlotLock; AutoCloseFD bestSlotLock;

4
src/libstore/build/derivation-goal.cc
View File

@ -3291,7 +3291,7 @@ void DerivationGoal::registerOutputs()
auto localStoreP = dynamic_cast<LocalStore *>(&worker.store); auto localStoreP = dynamic_cast<LocalStore *>(&worker.store);
if (!localStoreP) if (!localStoreP)
Unsupported("Can only register outputs with local store"); throw Unsupported("can only register outputs with local store, but this is %s", worker.store.getUri());
auto & localStore = *localStoreP; auto & localStore = *localStoreP;
if (buildMode == bmCheck) { if (buildMode == bmCheck) {
@ -3426,7 +3426,7 @@ void DerivationGoal::registerOutputs()
{ {
auto localStoreP = dynamic_cast<LocalStore *>(&worker.store); auto localStoreP = dynamic_cast<LocalStore *>(&worker.store);
if (!localStoreP) if (!localStoreP)
Unsupported("Can only register outputs with local store"); throw Unsupported("can only register outputs with local store, but this is %s", worker.store.getUri());
auto & localStore = *localStoreP; auto & localStore = *localStoreP;
ValidPathInfos infos2; ValidPathInfos infos2;