guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: services: Check if service is #f before applying


From: guix-commits
Subject: branch master updated: services: Check if service is #f before applying clause.
Date: Tue, 06 Jun 2023 07:39:54 -0400

This is an automated email from the git hooks/post-receive script.

jpoiret pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 1a2eb26286 services: Check if service is #f before applying clause.
1a2eb26286 is described below

commit 1a2eb26286c72ac2754969f53f5833b053b96b67
Author: Josselin Poiret <dev@jpoiret.xyz>
AuthorDate: Tue Jun 6 13:18:46 2023 +0200

    services: Check if service is #f before applying clause.
    
    * gnu/services.scm (apply-clauses): Check if service is #f before trying to
    apply clause.  Follow up of 181951207339508789b28ba7cb914f983319920f.
---
 gnu/services.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/services.scm b/gnu/services.scm
index 5410d31971..109e050a23 100644
--- a/gnu/services.scm
+++ b/gnu/services.scm
@@ -343,12 +343,14 @@ used."
       ((head . tail)
        (let ((service clauses
                       (fold2 (lambda (clause service remainder)
-                               (match clause
-                                 ((kind proc properties)
-                                  (if (eq? kind (service-kind service))
-                                      (values (proc service) remainder)
-                                      (values service
-                                              (cons clause remainder))))))
+                               (if service
+                                   (match clause
+                                     ((kind proc properties)
+                                      (if (eq? kind (service-kind service))
+                                          (values (proc service) remainder)
+                                          (values service
+                                                  (cons clause remainder)))))
+                                   (values #f (cons clause remainder))))
                              head
                              '()
                              clauses)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]