artemist/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

build-remote no longer requires local store be local

Browse source
This commit is contained in:
John Ericson 2020-12-20 17:07:28 +00:00
parent 57062179ce
commit 12f7a1f65b
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -71,11 +71,15 @@ static int main_build_remote(int argc, char * * argv)
initPlugins(); initPlugins();
auto store = openStore().cast<LocalStore>(); auto store = openStore();
/* 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 = store->stateDir + "/current-load"; currentLoad = "/current-load";
if (auto localStore = store.dynamic_pointer_cast<LocalFSStore>())
currentLoad = std::string { localStore->stateDir } + currentLoad;
else
currentLoad = settings.nixStateDir + currentLoad;
std::shared_ptr<Store> sshStore; std::shared_ptr<Store> sshStore;
AutoCloseFD bestSlotLock; AutoCloseFD bestSlotLock;
@ -288,8 +292,9 @@ connected:
if (!missing.empty()) { if (!missing.empty()) {
Activity act(*logger, lvlTalkative, actUnknown, fmt("copying outputs from '%s'", storeUri)); Activity act(*logger, lvlTalkative, actUnknown, fmt("copying outputs from '%s'", storeUri));
for (auto & i : missing) if (auto localStore = store.dynamic_pointer_cast<LocalStore>())
store->locksHeld.insert(store->printStorePath(i)); /* FIXME: ugly */ for (auto & i : missing)
localStore->locksHeld.insert(store->printStorePath(i)); /* FIXME: ugly */
copyPaths(ref<Store>(sshStore), store, missing, NoRepair, NoCheckSigs, NoSubstitute); copyPaths(ref<Store>(sshStore), store, missing, NoRepair, NoCheckSigs, NoSubstitute);
} }