diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-01-23 22:33:10 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-01-23 22:33:10 +0100 |
| commit | 58ea4d407c2e4adbe51b2d7b71dc8bef095677c7 (patch) | |
| tree | 0fd70c0cb82d7980a7ff82500dec7bfd0d535d3f /guix/scripts/environment.scm | |
| parent | fcd75bdbfa99d14363b905afbf914eec20e69df8 (diff) | |
| parent | 84b60a7cdfca1421a478894e279104a0c18a7c6d (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts/environment.scm')
| -rw-r--r-- | guix/scripts/environment.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index 1d3be6a84f..a08367d1b1 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 David Thompson <davet@gnu.org> -;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -531,8 +531,10 @@ message if any test fails." (define (register-gc-root target root) "Make ROOT an indirect root to TARGET. This is procedure is idempotent." - (let* ((root (string-append (canonicalize-path (dirname root)) - "/" root))) + (let* ((root (if (string-prefix? "/" root) + root + (string-append (canonicalize-path (dirname root)) + "/" root)))) (catch 'system-error (lambda () (symlink target root) |