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

Fix remote building

Browse source
This commit is contained in:
Eelco Dolstra 2015-06-17 17:28:59 +02:00
parent 11be780948
commit ca48818b30
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/hydra-queue-runner/build-remote.cc
View file

@ -145,9 +145,19 @@ void buildRemote(std::shared_ptr<StoreAPI> store,
throw Error(format("cannot connect to ‘%1%’: %2%") % sshName % chomp(readFile(logFile))); throw Error(format("cannot connect to ‘%1%’: %2%") % sshName % chomp(readFile(logFile)));
} }
/* Gather the inputs. */
PathSet inputs({drvPath});
for (auto & input : drv.inputDrvs) {
Derivation drv2 = readDerivation(input.first);
for (auto & name : input.second) {
auto i = drv2.outputs.find(name);
if (i != drv2.outputs.end()) inputs.insert(i->second.path);
}
}
/* Copy the input closure. */ /* Copy the input closure. */
printMsg(lvlDebug, format("sending closure of ‘%1%’ to ‘%2%’") % drvPath % sshName); printMsg(lvlDebug, format("sending closure of ‘%1%’ to ‘%2%’") % drvPath % sshName);
copyClosureTo(store, from, to, PathSet({drvPath})); copyClosureTo(store, from, to, inputs);
/* Do the build. */ /* Do the build. */
printMsg(lvlDebug, format("building ‘%1%’ on ‘%2%’") % drvPath % sshName); printMsg(lvlDebug, format("building ‘%1%’ on ‘%2%’") % drvPath % sshName);