summaryrefslogtreecommitdiff
path: root/gnu/ci.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2019-08-29 17:19:18 -0400
committerMark H Weaver <mhw@netris.org>2019-08-29 17:19:18 -0400
commit0481289cbccba2646bf654f0ae49ac9c45602d5d (patch)
treecbe1351e2751e9d22c4c8add02991a3e6674f26a /gnu/ci.scm
parentc55fae452032aa4b1b63406983e9abdf70adc957 (diff)
parent9fbf4d2a52d4d3e01059f3432bb3f78182b5a822 (diff)
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/ci.scm')
-rw-r--r--gnu/ci.scm8
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/ci.scm b/gnu/ci.scm
index aeebd4f14b..5d5a826647 100644
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -331,8 +331,12 @@ valid."
"Return the list of packages to build."
(define (adjust package result)
(cond ((package-replacement package)
- (cons* package ;build both
- (package-replacement package)
+ ;; XXX: If PACKAGE and its replacement have the same name/version,
+ ;; then both Cuirass jobs will have the same name, which
+ ;; effectively means that the second one will be ignored. Thus,
+ ;; return the replacement first.
+ (cons* (package-replacement package) ;build both
+ package
result))
((package-superseded package)
result) ;don't build it