From c3aaf3b8da1a925c569389f13a861816a781a3c8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 10 Oct 2019 09:14:05 +0200
Subject: nix-env: Ignore failures creating ~/.nix-profile and ~/.nix-defexpr

https://hydra.nixos.org/build/102803093
---
 src/nix-env/nix-env.cc | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

(limited to 'src/nix-env')

diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index 2aeb8ebb0..199dc92aa 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -1325,14 +1325,16 @@ static int _main(int argc, char * * argv)
         globals.instSource.systemFilter = "*";
 
         if (!pathExists(globals.instSource.nixExprPath)) {
-            createDirs(globals.instSource.nixExprPath);
-            replaceSymlink(
-                fmt("%s/profiles/per-user/%s/channels", settings.nixStateDir, getUserName()),
-                globals.instSource.nixExprPath + "/channels");
-            if (getuid() != 0)
+            try {
+                createDirs(globals.instSource.nixExprPath);
                 replaceSymlink(
-                    fmt("%s/profiles/per-user/root/channels", settings.nixStateDir),
-                    globals.instSource.nixExprPath + "/channels_root");
+                    fmt("%s/profiles/per-user/%s/channels", settings.nixStateDir, getUserName()),
+                    globals.instSource.nixExprPath + "/channels");
+                if (getuid() != 0)
+                    replaceSymlink(
+                        fmt("%s/profiles/per-user/root/channels", settings.nixStateDir),
+                        globals.instSource.nixExprPath + "/channels_root");
+            } catch (Error &) { }
         }
 
         globals.dryRun = false;
@@ -1427,14 +1429,18 @@ static int _main(int argc, char * * argv)
 
         if (globals.profile == "") {
             Path profileLink = getHome() + "/.nix-profile";
-            if (!pathExists(profileLink)) {
-                replaceSymlink(
-                    getuid() == 0
-                    ? settings.nixStateDir + "/profiles/default"
-                    : fmt("%s/profiles/per-user/%s/profile", settings.nixStateDir, getUserName()),
-                    profileLink);
+            try {
+                if (!pathExists(profileLink)) {
+                    replaceSymlink(
+                        getuid() == 0
+                        ? settings.nixStateDir + "/profiles/default"
+                        : fmt("%s/profiles/per-user/%s/profile", settings.nixStateDir, getUserName()),
+                        profileLink);
+                }
+                globals.profile = absPath(readLink(profileLink), dirOf(profileLink));
+            } catch (Error &) {
+                globals.profile = profileLink;
             }
-            globals.profile = absPath(readLink(profileLink), dirOf(profileLink));
         }
 
         op(globals, opFlags, opArgs);
-- 
cgit v1.2.3