From 47f19b6293357a8bdc3a2290813765170f241b58 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Jan 2004 20:36:58 +0000 Subject: [PATCH] * Absolutise the specified path in `--import' and `--profile'. --- src/nix-env/main.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nix-env/main.cc b/src/nix-env/main.cc index 5c27a89fc..eaa11fe25 100644 --- a/src/nix-env/main.cc +++ b/src/nix-env/main.cc @@ -629,7 +629,7 @@ static void opSwitchProfile(Globals & globals, throw UsageError(format("`--profile' takes at most one argument")); Path linkPath = - opArgs.size() == 0 ? globals.linkPath : opArgs.front(); + absPath(opArgs.size() == 0 ? globals.linkPath : opArgs.front()); Path linkPathFinal = getHomeDir() + "/.nix-userenv"; switchLink(linkPathFinal, linkPath); @@ -644,7 +644,7 @@ static void opDefaultExpr(Globals & globals, if (opArgs.size() != 1) throw UsageError(format("`--import' takes exactly one argument")); - Path defNixExpr = opArgs.front(); + Path defNixExpr = absPath(opArgs.front()); Path defNixExprLink = getDefNixExprPath(); switchLink(defNixExprLink, defNixExpr);