summaryrefslogtreecommitdiff
path: root/guix/scripts
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-07-13 14:33:11 +0200
committerLudovic Courtès <ludo@gnu.org>2018-07-13 17:28:39 +0200
commitbc6e291ef0b3c71c07e50d88d7764e5dd334e8b1 (patch)
treef6b08da3fd857738de0b51f6746d9c864da25953 /guix/scripts
parent0bc2d3e42b8800e875f24973f999739297f1f502 (diff)
guix package: Use relative symlinks to generations.
Reported by Roel Janssen <roel@gnu.org> at <https://lists.gnu.org/archive/html/guix-devel/2018-07/msg00036.html>. * guix/profiles.scm (switch-to-generation): Use (basename generation) as the symlink target. * guix/scripts/package.scm (build-and-use-profile): Likewise, use (basename name) as the symlink target. * tests/guix-package.sh: Adjust --roll-back test accordingly. Add explicitly test with '-p foo/prof'.
Diffstat (limited to 'guix/scripts')
-rw-r--r--guix/scripts/package.scm2
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 29829f52c8..b38a55d01c 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -190,7 +190,7 @@ do not treat collisions in MANIFEST as an error."
(let* ((entries (manifest-entries manifest))
(count (length entries)))
(switch-symlinks name prof)
- (switch-symlinks profile name)
+ (switch-symlinks profile (basename name))
(unless (string=? profile %current-profile)
(register-gc-root store name))
(format #t (N_ "~a package in profile~%"