[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: hydra: cuirass: Remove duplicates from the list of jobs.
|
From: |
Ludovic Courtès |
|
Subject: |
01/01: hydra: cuirass: Remove duplicates from the list of jobs. |
|
Date: |
Fri, 25 Aug 2017 18:49:59 -0400 (EDT) |
civodul pushed a commit to branch master
in repository maintenance.
commit 7d4d6c13f46f2a307883226789d6aa503e2d7081
Author: Ludovic Courtès <address@hidden>
Date: Sat Aug 26 00:48:13 2017 +0200
hydra: cuirass: Remove duplicates from the list of jobs.
* hydra/cuirass-jobs.scm (hydra-jobs): Add call to 'delete-duplicates'.
---
hydra/cuirass-jobs.scm | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/hydra/cuirass-jobs.scm b/hydra/cuirass-jobs.scm
index 04854f6..2545186 100644
--- a/hydra/cuirass-jobs.scm
+++ b/hydra/cuirass-jobs.scm
@@ -212,14 +212,19 @@ valid."
(case subset
((all)
;; Build everything, including replacements.
- (let ((pkgs (fold-packages
- (lambda (package result)
- (if (package-replacement package)
- (cons* package
- (package-replacement package)
- result)
- (cons package result)))
- '())))
+ ;; XXX: If a replacement is also exported, it ends up
+ ;; twice in our list, so we delete duplicates to work
+ ;; around <http://bugs.gnu.org/28094>.
+ (let ((pkgs (delete-duplicates
+ (fold-packages
+ (lambda (package result)
+ (if (package-replacement package)
+ (cons* package
+ (package-replacement package)
+ result)
+ (cons package result)))
+ '())
+ eq?)))
(append (filter-map (lambda (pkg)
(and (not (string=? "wine"
(package-name pkg)))
(package->job store pkg
system)))