nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-27 12:41:00 +01:00
Code Activity

Added state marshall functions in RemoteStore.cc (still unfinished in Nix-worker.cc)

Browse source
This commit is contained in:
Wouter den Breejen 2007-08-27 18:54:05 +00:00
parent bdcce95a39
commit 2e7539bd27
18 changed files with 423 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/build.cc
View file

@ -1308,7 +1308,7 @@ bool DerivationGoal::prepareBuild()
}
/* The state output is a referenceable path */
if(store->isStateDrv(drv))
if(isStateDrv(drv))
allStatePaths.insert(drv.stateOutputs.find("state")->second.statepath);
/* Determine the full set of input paths. */
@ -1754,7 +1754,7 @@ void DerivationGoal::computeClosure()
* If state is enabled for the path we:
* [scan for and state references and component references in the state path] //3,4
*/
if(isStateDrvTxn(noTxn, drv)){ //TODO
if(isStateDrv(drv)){ //TODO
Path sharedState = drv.stateOutputs.find("state")->second.sharedState;
if(sharedState != ""){
@ -1799,7 +1799,7 @@ void DerivationGoal::computeClosure()
}
//Register the state path valid
if(isStateDrvTxn(txn, drv))
if(isStateDrv(drv))
{
Path statePath = drv.stateOutputs.find("state")->second.statepath;