describe: 'current-channel-entries' ignores non-channel profile entries.
Fixes <https://bugs.gnu.org/48778>.
A side effect of c47f3fc135
is that
(@ (guix describe) current-profile) provides the correct answer when the
'guix' package is installed in a profile. Consequently, the 'guix'
package installed in /run/current-system/profile (for instance) would
end up loading all the .scm files in that directory.
* guix/describe.scm (current-channel-entries): Remove ENTRY if it lacks
the 'source' property.
This commit is contained in:
parent
bd02e50a02
commit
fb3927486a
|
@ -115,7 +115,11 @@ lives in, or the empty list if this is not applicable."
|
||||||
"Return manifest entries corresponding to extra channels--i.e., not the
|
"Return manifest entries corresponding to extra channels--i.e., not the
|
||||||
'guix' channel."
|
'guix' channel."
|
||||||
(remove (lambda (entry)
|
(remove (lambda (entry)
|
||||||
(string=? (manifest-entry-name entry) "guix"))
|
(or (string=? (manifest-entry-name entry) "guix")
|
||||||
|
|
||||||
|
;; If ENTRY lacks the 'source' property, it's not an entry
|
||||||
|
;; from 'guix pull'. See <https://bugs.gnu.org/48778>.
|
||||||
|
(not (assq 'source (manifest-entry-properties entry)))))
|
||||||
(current-profile-entries))))
|
(current-profile-entries))))
|
||||||
|
|
||||||
(define current-channels
|
(define current-channels
|
||||||
|
|
Loading…
Reference in New Issue