guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: build-system/channel: Correctly handle store file name from (gnu


From: guix-commits
Subject: 02/02: build-system/channel: Correctly handle store file name from (gnu ci).
Date: Thu, 11 Aug 2022 10:02:52 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit a81706494753ad84754cbb7583ccc783452decc0
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Aug 11 15:55:38 2022 +0200

    build-system/channel: Correctly handle store file name from (gnu ci).
    
    This is a followup to cf60a0a906440ccb007bae1243c3e0397c3a0aba.
    
    Reported by Mathieu Othacehe <othacehe@gnu.org>.
    
    * guix/build-system/channel.scm (build-channels): Add 'string?' case.
---
 guix/build-system/channel.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/guix/build-system/channel.scm b/guix/build-system/channel.scm
index b6ef3bfacf..6ad377f930 100644
--- a/guix/build-system/channel.scm
+++ b/guix/build-system/channel.scm
@@ -46,6 +46,13 @@
                                (latest-channel-instances*
                                 (list source)
                                 #:authenticate? authenticate?))
+                              ((string? source)
+                               ;; If SOURCE is a store file name, as is the
+                               ;; case when called from (gnu ci), return it as
+                               ;; is.
+                               (return
+                                (list (checkout->channel-instance
+                                       source #:commit commit))))
                               (else
                                (mlet %store-monad ((source
                                                     (lower-object source)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]