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

* Absolutise the specified path in --import' and --profile'.

Browse source
This commit is contained in:
Eelco Dolstra 2004-01-20 20:36:58 +00:00
parent 4db7ef3fcc
commit 47f19b6293
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nix-env/main.cc
View file

@ -629,7 +629,7 @@ static void opSwitchProfile(Globals & globals,
throw UsageError(format("`--profile' takes at most one argument")); throw UsageError(format("`--profile' takes at most one argument"));
Path linkPath = Path linkPath =
opArgs.size() == 0 ? globals.linkPath : opArgs.front(); absPath(opArgs.size() == 0 ? globals.linkPath : opArgs.front());
Path linkPathFinal = getHomeDir() + "/.nix-userenv"; Path linkPathFinal = getHomeDir() + "/.nix-userenv";
switchLink(linkPathFinal, linkPath); switchLink(linkPathFinal, linkPath);
@ -644,7 +644,7 @@ static void opDefaultExpr(Globals & globals,
if (opArgs.size() != 1) if (opArgs.size() != 1)
throw UsageError(format("`--import' takes exactly one argument")); throw UsageError(format("`--import' takes exactly one argument"));
Path defNixExpr = opArgs.front(); Path defNixExpr = absPath(opArgs.front());
Path defNixExprLink = getDefNixExprPath(); Path defNixExprLink = getDefNixExprPath();
switchLink(defNixExprLink, defNixExpr); switchLink(defNixExprLink, defNixExpr);