From 1a8ea0a1885ca5fff85eb00fc79d6c6bcd47818a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 13 Mar 2014 22:57:21 +0100 Subject: offload: Fix 'choose-build-machine' for several machines. * guix/scripts/offload.scm (choose-build-machine)[undecorate]: Turn into a two-argument procedure. --- guix/scripts/offload.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/guix/scripts/offload.scm b/guix/scripts/offload.scm index c9ea457db1..95e35088a1 100644 --- a/guix/scripts/offload.scm +++ b/guix/scripts/offload.scm @@ -466,10 +466,14 @@ allowed on MACHINE." machines)) (define (undecorate pred) - (match-lambda - ((machine slot) - (and (pred machine) - (list machine slot))))) + (lambda (a b) + (match a + ((machine1 slot1) + (match b + ((machine2 slot2) + (if (pred machine1 machine2) + (list machine1 slot1) + (list machine2 slot2)))))))) (let ((machines+slots (sort machines+slots (undecorate machine-less-loaded-or-faster?)))) -- cgit v1.2.3