ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ci: Adjust 'channel-build-system' for when the source is a file name.

Browse source 
Fixes an evaluation error introduced in
dd1ee160be: when invoked via
'build-aux/cuirass/gnu-system.scm', SOURCE is a store file name, not a
<local-file> as it is when invoked via 'etc/system-tests.scm'.

* gnu/ci.scm (channel-build-system)[build]: Call 'lower-object' only
when SOURCE is not a string.
This commit is contained in:
Ludovic Courtès 2020-03-05 23:36:01 +01:00
parent 530e31b824
commit bc8b2ffdac
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/ci.scm
View file

@ -243,7 +243,11 @@ (define channel-build-system
#:key source commit system #:key source commit system
#:allow-other-keys) #:allow-other-keys)
(run-with-store store (run-with-store store
(mlet* %store-monad ((source (lower-object source)) ;; SOURCE can be a lowerable object such as <local-file>
;; or a file name. Adjust accordingly.
(mlet* %store-monad ((source (if (string? source)
(return source)
(lower-object source)))
(instance (instance
-> (checkout->channel-instance -> (checkout->channel-instance
source #:commit commit))) source #:commit commit)))