nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pull: Fix target of /var/guix/profiles/per-user/USER/current-guix. 

This is a followup to 8155a20907.

* guix/scripts/pull.scm (migrate-generations): Compute the right target
for /var/guix/profiles/per-user/USER/current-guix.  Previously we'd
return "current-N-link" instead of "current-guix-N-link'.
This commit is contained in:
Ludovic Courtès 2018-10-12 16:43:18 +02:00
parent 6826f1e1ed
commit aa227b3be3
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
guix/scripts/pull.scm
View File

@ -243,9 +243,7 @@ Download and deploy the latest version of Guix.\n"))
(format (current-error-port) (format (current-error-port)
(G_ "Migrating profile generations to '~a'...~%") (G_ "Migrating profile generations to '~a'...~%")
%profile-directory) %profile-directory)
(let ((current (basename (let ((current (generation-number profile)))
(generation-file-name profile
(generation-number profile)))))
(for-each (lambda (generation) (for-each (lambda (generation)
(let ((source (generation-file-name profile generation)) (let ((source (generation-file-name profile generation))
(target (string-append directory "/current-guix-" (target (string-append directory "/current-guix-"
@ -256,7 +254,9 @@ Download and deploy the latest version of Guix.\n"))
(symlink (readlink source) target) (symlink (readlink source) target)
(delete-file source))) (delete-file source)))
(profile-generations profile)) (profile-generations profile))
(symlink current (string-append directory "/current-guix")))) (symlink (string-append "current-guix-"
(number->string current) "-link")
(string-append directory "/current-guix"))))
(define (ensure-default-profile) (define (ensure-default-profile)
(ensure-profile-directory) (ensure-profile-directory)