diff mbox series

[bug#45919,5/8] channels: Add the channel name to channel sexps.

Message ID 20210116183409.31229-5-ludo@gnu.org
State Accepted
Headers show
Series Exporting a manifest and channels from a profile | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Ludovic Courtès Jan. 16, 2021, 6:34 p.m. UTC 
* guix/channels.scm (channel-instance->sexp): Add 'name'.
(sexp->channel): Extract the name from SEXP, using the optional argument
as a fallback.
---
 guix/channels.scm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/guix/channels.scm b/guix/channels.scm
index 65a0d849ec..6449221c3f 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -812,6 +812,7 @@  derivation."
       (url ,(channel-url channel))
       (branch ,(channel-branch channel))
       (commit ,commit)
+      (name ,(channel-name channel))
       ,@(if intro
             `((introduction
                (channel-introduction
@@ -907,16 +908,22 @@  to 'latest-channel-instances'."
     (channel-instances->derivation instances)))
 
 (define* (sexp->channel sexp #:optional (name 'channel))
-  "Read SEXP, a provenance sexp as created by 'channel-instance->sexp',
-and return a channel called NAME.  Return #f if the sexp does not have the
-expected structure."
+  "Read SEXP, a provenance sexp as created by 'channel-instance->sexp'; use
+NAME as the channel name if SEXP does not specify it.  Return #f if the sexp
+does not have the expected structure."
   (match sexp
     (('repository ('version 0)
                   ('url url)
                   ('branch branch)
                   ('commit commit)
                   rest ...)
-     (channel (name name)
+     ;; Historically channel sexps did not include the channel name.  It's OK
+     ;; for channels created by 'channel-instances->manifest' because the
+     ;; entry name is the channel name, but it was missing for entries created
+     ;; by 'manifest-entry-with-provenance'.
+     (channel (name (match (assq 'name rest)
+                      (#f name)
+                      (('name name) name)))
               (url url)
               (commit commit)
               (introduction