From b5033c5a9e1b1f06a7daf9b8de6ff9f9c8431a97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 7 Nov 2017 17:06:32 +0100
Subject: [PATCH] hydra: Factorize package list creation.

* build-aux/hydra/gnu-system.scm (all-packages): New procedure, with
body taken from...
(hydra-jobs): ... here.  Use it.
---
 build-aux/hydra/gnu-system.scm | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 146d929f9b..1782969bf8 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -261,6 +261,19 @@ valid."
             (else
              #f)))))
 
+(define (all-packages)
+  "Return the list of packages to build."
+  (fold-packages (lambda (package result)
+                   (cond ((package-replacement package)
+                          (cons* package          ;build both
+                                 (package-replacement package)
+                                 result))
+                         ((package-superseded package)
+                          result)                 ;don't build it
+                         (else
+                          (cons package result))))
+                 '()))
+
 
 ;;;
 ;;; Hydra entry point.
@@ -317,17 +330,7 @@ valid."
                   (case subset
                     ((all)
                      ;; Build everything, including replacements.
-                     (let ((all (fold-packages
-                                 (lambda (package result)
-                                   (cond ((package-replacement package)
-                                          (cons* package
-                                                 (package-replacement package)
-                                                 result))
-                                         ((package-superseded package)
-                                          result) ;don't build it
-                                         (else
-                                          (cons package result))))
-                                 '()))
+                     (let ((all (all-packages))
                            (job (lambda (package)
                                   (package->job store package
                                                 system))))