summaryrefslogtreecommitdiff
path: root/guix/scripts/package.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-02-28 19:07:46 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-02-28 19:07:46 +0100
commitd614f0bba90c86c836131eea3ebb9cbd30f19abf (patch)
tree22e6250fc344f86e0e356e0dcad254b95373877a /guix/scripts/package.scm
parent7fe962788ac330fce18d7cc39f613bb1f961d6ea (diff)
parent20c87138a9ca1bbccef2ee91589f11ec70985555 (diff)
downloadpatches-d614f0bba90c86c836131eea3ebb9cbd30f19abf.tar
patches-d614f0bba90c86c836131eea3ebb9cbd30f19abf.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'guix/scripts/package.scm')
-rw-r--r--guix/scripts/package.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 1cb0d382bf..d2f4f1ccd3 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -81,12 +81,15 @@
"Ensure the default profile symlink and directory exist and are writable."
(ensure-profile-directory)
- ;; Create ~/.guix-profile if it doesn't exist yet.
+ ;; Try to create ~/.guix-profile if it doesn't exist yet.
(when (and %user-profile-directory
%current-profile
(not (false-if-exception
(lstat %user-profile-directory))))
- (symlink %current-profile %user-profile-directory)))
+ (catch 'system-error
+ (lambda ()
+ (symlink %current-profile %user-profile-directory))
+ (const #t))))
(define (delete-generations store profile generations)
"Delete GENERATIONS from PROFILE.