From 912adda316886cef5f3f870e53d607bf8d02222f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 18 Sep 2018 22:49:41 +0200 Subject: 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. --- guix/scripts/describe.scm | 6 ++++-- guix/scripts/pull.scm | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm index fdff07d0e3..c1a20fe26c 100644 --- a/guix/scripts/describe.scm +++ b/guix/scripts/describe.scm @@ -134,8 +134,10 @@ (define number ;; Show most recently installed packages last. (reverse (manifest-entries - (profile-manifest (generation-file-name profile - number))))))))) + (profile-manifest + (if (zero? number) + profile + (generation-file-name profile number)))))))))) (display-package-search-path fmt)) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 976e054a84..c0686f16bf 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -233,7 +233,9 @@ (define (display-profile-content profile number) ;; Show most recently installed packages last. (reverse (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) "Return STR with each newline preceded by IDENT spaces." -- cgit v1.2.3