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

describe: Work correctly on generation-less profiles. 

Previously a command like:

  $(readlink -f ~/.config/guix/current)/bin/guix describe

would succeed without printing anything.

* guix/scripts/describe.scm (display-profile-info): Don't call
'generation-file-name' when NUMBER is zero.
* guix/scripts/pull.scm (display-profile-content): Likewise.
This commit is contained in:
Ludovic Courtès 2018-09-18 22:49:41 +02:00
parent cda08dd339
commit 912adda316
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/scripts/describe.scm
View File

@ -134,8 +134,10 @@ in the format specified by FMT."
;; Show most recently installed packages last. ;; Show most recently installed packages last.
(reverse (reverse
(manifest-entries (manifest-entries
(profile-manifest (generation-file-name profile (profile-manifest
number))))))))) (if (zero? number)
profile
(generation-file-name profile number))))))))))
(display-package-search-path fmt)) (display-package-search-path fmt))

4
guix/scripts/pull.scm
View File

@ -233,7 +233,9 @@ way and displaying details about the channel's source code."
;; Show most recently installed packages last. ;; Show most recently installed packages last.
(reverse (reverse
(manifest-entries (manifest-entries
(profile-manifest (generation-file-name profile number)))))) (profile-manifest (if (zero? number)
profile
(generation-file-name profile number)))))))
(define (indented-string str indent) (define (indented-string str indent)
"Return STR with each newline preceded by IDENT spaces." "Return STR with each newline preceded by IDENT spaces."