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

Browse source
This commit is contained in:
Wouter den Breejen 2007-09-17 15:38:13 +00:00
parent e80c7bda4c
commit 315cd18337
5 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/nix-env/nix-env.cc
View file

@ -564,10 +564,15 @@ static void installDerivations(Globals & globals,
//if it doesnt need to share state with some other component
//&& the identifiers are equal
//TODO !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//TODO && (the users are equal || OR SHARED BETWEEN USERS)
//TODO
if( newSharedState == ""
&&
(oldStateIdentifier == newStateIdentifier
|| (oldStateIdentifier == "__EMTPY__" && newStateIdentifier == ""))
|| (oldStateIdentifier == "__EMTPY__" && newStateIdentifier == ""))
){
string oldStatePath;
@ -604,10 +609,14 @@ static void installDerivations(Globals & globals,
return;
}
printMsg(lvlError, format("DONE!!!!!!!!"));
createUserEnv(globals.state, allElems,
profile, globals.keepDerivations);
//After all components have been built succesfully, share their state paths with the old ones
printMsg(lvlError, format("DONE!!!!!!!!"));
//After all components have been built succesfully, share their state paths with the old ones
for (StringPairs::iterator i = toBeShared.begin(); i != toBeShared.end(); ++i){
printMsg(lvlError, format("Sharing state from old <-- new component '%1%' <-- '%2%'") % i->first % i->second);
@ -618,6 +627,7 @@ static void installDerivations(Globals & globals,
//Set in database
store->setSharedState(i->first, i->second);
}
//Let the stateDirs in /nix/state point to the solidStateDependencies
for (StringPairs::iterator i = externalStates.begin(); i != externalStates.end(); ++i){