Re: [PATCH] profiles: Let canonicalize-profile return an absolute path.

[ludo@gnu.org (Ludovic Courtès)]

[-- Attachment #1: Type: text/plain, Size: 1333 bytes --]

Hi Roel,

Roel Janssen <roel@gnu.org> skribis:

> I'd like to change the way the symlinks to custom profiles are created.
> Here's what currently happens:
>
> $ guixr package -i hello -p guix-profiles/test
> $ ls -l guix-profiles
> lrwxrwxrwx. 1 user group 25 Jul  3 19:53 test -> guix-profiles/test-1-link
> lrwxrwxrwx. 1 user group 51 Jul  3 19:53 test-1-link -> /gnu/store/...6qbaps-profile
>
> Now, that symlink is broken.
> Instead, I'd like to have it always use absolute paths:

How about instead making the link to the generation file (“test-1-link”)
always a relative symlink?  Like this:

--8<---------------cut here---------------start------------->8---
$ ./pre-inst-env guix package -p foo/x -i sed

[...]

$ ls -l foo/*
lrwxrwxrwx 1 ludo users  8 Jul 11 13:03 foo/x -> x-1-link
lrwxrwxrwx 1 ludo users 51 Jul 11 13:03 foo/x-1-link -> /gnu/store/qp6dqlbsf0pw9p9fwc3gzdcaxx40rn9v-profile
--8<---------------cut here---------------end--------------->8---

Patch below.

FWIW I prefer avoiding ‘canonicalize-path’ in general because it’s
inefficient and because it can surprise the user: you can end up with a
long file name that you didn’t type in, or you can have ENOENT errors
because ‘canonicalize-path’ requires the given file to exist.

WDYT?

Thanks,
Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1680 bytes --]

diff --git a/guix/profiles.scm b/guix/profiles.scm
index d2a794b18..f34f4fcff 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1521,7 +1521,7 @@ the generation that was current before switching."
                               (profile profile)
                               (generation number)))))
           (else
-           (switch-symlinks profile generation)
+           (switch-symlinks profile (basename generation))
            current))))
 
 (define (switch-to-previous-generation profile)
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 29829f52c..b38a55d01 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~%"
diff --git a/tests/guix-package.sh b/tests/guix-package.sh
index 3b3fa35cd..3833b568a 100644
--- a/tests/guix-package.sh
+++ b/tests/guix-package.sh
@@ -215,7 +215,7 @@ do
     guix package --bootstrap --roll-back
     ! test -f "$HOME/.guix-profile/bin"
     ! test -f "$HOME/.guix-profile/lib"
-    test "`readlink "$default_profile"`" = "$default_profile-0-link"
+    test "`readlink "$default_profile"`" = "`basename $default_profile-0-link`"
 done
 
 # Check whether '-p ~/.guix-profile' makes any difference.