diff options
Diffstat (limited to 'src/nix-env')
| -rw-r--r-- | src/nix-env/nix-env.cc | 4 | ||||
| -rw-r--r-- | src/nix-env/profiles.cc | 11 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc index 10b95dad168c..5cf41e844e83 100644 --- a/src/nix-env/nix-env.cc +++ b/src/nix-env/nix-env.cc @@ -1423,6 +1423,8 @@ int main(int argc, char * * argv) if (!op) throw UsageError("no operation specified"); + store = openStore(); + globals.state = std::shared_ptr<EvalState>(new EvalState(searchPath)); globals.state->repair = repair; @@ -1441,8 +1443,6 @@ int main(int argc, char * * argv) : canonPath(settings.nixStateDir + "/profiles/default"); } - store = openStore(); - op(globals, opFlags, opArgs); globals.state->printStats(); diff --git a/src/nix-env/profiles.cc b/src/nix-env/profiles.cc index cedefb157a4b..5b7a533df290 100644 --- a/src/nix-env/profiles.cc +++ b/src/nix-env/profiles.cc @@ -134,16 +134,7 @@ void switchLink(Path link, Path target) /* Hacky. */ if (dirOf(target) == dirOf(link)) target = baseNameOf(target); - Path tmp = canonPath(dirOf(link) + "/.new_" + baseNameOf(link)); - createSymlink(target, tmp); - /* The rename() system call is supposed to be essentially atomic - on Unix. That is, if we have links `current -> X' and - `new_current -> Y', and we rename new_current to current, a - process accessing current will see X or Y, but never a - file-not-found or other error condition. This is sufficient to - atomically switch user environments. */ - if (rename(tmp.c_str(), link.c_str()) != 0) - throw SysError(format("renaming ‘%1%’ to ‘%2%’") % tmp % link); + replaceSymlink(target, link); } |