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

Fixed ~ and * to expand in cp and ln commands.

Browse source
This commit is contained in:
Wouter den Breejen 2007-09-19 22:00:43 +00:00
parent 4c32f38047
commit 86f0fd8341
2 changed files with 40 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -639,7 +639,7 @@ static void installDerivations(Globals & globals,
PathSet comparePaths;
comparePaths.insert(statePath);
comparePaths.insert(read_statePath);
if(store->toNonSharedPathSet(comparePaths).size() != 1)
if(store->toNonSharedPathSet(comparePaths).size() != 1) //TODO !!!!!!!!!!!!! only copy when not already a symlink to a statePath !!!!!!!!!
copyContents(externalState, statePath);
}
else
@ -659,6 +659,7 @@ static void installDerivations(Globals & globals,
//Now we create a symlink externalState --> statePath
printMsg(lvlError, format("SYMLINK: '%1%' --> '%2%'") % externalState % statePath);
executeShellCommand("whoami");
symlinkPath(statePath, externalState);
}