From 4dfce0115f3d09945bf9f5a0775ffbf20ba39c79 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 25 Feb 2021 10:24:11 +0100 Subject: describe: Make sure package-channels always returns a list. * guix/describe.scm (package-channels): Return an empty list if the file origin could not be determined. --- guix/describe.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'guix') diff --git a/guix/describe.scm b/guix/describe.scm index 46448de311..0683ad8a27 100644 --- a/guix/describe.scm +++ b/guix/describe.scm @@ -156,16 +156,16 @@ not be determined." (let ((file (if (string-prefix? "/" file) file (search-path %load-path file)))) - (and file - (string-prefix? (%store-prefix) file) - - (filter-map - (lambda (entry) - (let ((item (manifest-entry-item entry))) - (and (or (string-prefix? item file) - (string=? "guix" (manifest-entry-name entry))) - (manifest-entry-channel entry)))) - (current-profile-entries))))))) + (if (and file + (string-prefix? (%store-prefix) file)) + (filter-map + (lambda (entry) + (let ((item (manifest-entry-item entry))) + (and (or (string-prefix? item file) + (string=? "guix" (manifest-entry-name entry))) + (manifest-entry-channel entry)))) + (current-profile-entries)) + '()))))) (define (package-provenance package) "Return the provenance of PACKAGE as an sexp for use as the 'provenance' -- cgit v1.2.3