diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-03-05 23:36:01 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-03-05 23:40:24 +0100 |
| commit | bc8b2ffdac3f55414629ace5b1a0db32e9656c0a (patch) | |
| tree | df9491836b77e0ae7a5d45e6e1ee108ba5935ef6 /gnu/ci.scm | |
| parent | 530e31b82448ba00dbbe6abc078204d340c09cb1 (diff) | |
ci: Adjust 'channel-build-system' for when the source is a file name.
Fixes an evaluation error introduced in
dd1ee160be8ba4e211432c08e161c24901cd670e: 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.
Diffstat (limited to 'gnu/ci.scm')
| -rw-r--r-- | gnu/ci.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/ci.scm b/gnu/ci.scm index 9dc530b01e0..e024c09ebc4 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm | |||
| @@ -243,7 +243,11 @@ system.") | |||
| 243 | #:key source commit system | 243 | #:key source commit system |
| 244 | #:allow-other-keys) | 244 | #:allow-other-keys) |
| 245 | (run-with-store store | 245 | (run-with-store store |
| 246 | (mlet* %store-monad ((source (lower-object source)) | 246 | ;; SOURCE can be a lowerable object such as <local-file> |
| 247 | ;; or a file name. Adjust accordingly. | ||
| 248 | (mlet* %store-monad ((source (if (string? source) | ||
| 249 | (return source) | ||
| 250 | (lower-object source))) | ||
| 247 | (instance | 251 | (instance |
| 248 | -> (checkout->channel-instance | 252 | -> (checkout->channel-instance |
| 249 | source #:commit commit))) | 253 | source #:commit commit))) |
