From patchwork Wed Jul 3 22:21:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sent X-Patchwork-Id: 65896 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EC3A327BBE9; Wed, 3 Jul 2024 23:22:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AFF6B27BBE2 for ; Wed, 3 Jul 2024 23:22:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sP8MT-00020F-Gh; Wed, 03 Jul 2024 18:22:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sP8MS-0001zz-NK for guix-patches@gnu.org; Wed, 03 Jul 2024 18:22:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sP8MS-0000aN-Da for guix-patches@gnu.org; Wed, 03 Jul 2024 18:22:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sP8MU-0007TT-41 for guix-patches@gnu.org; Wed, 03 Jul 2024 18:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71928] [PATCH v2] gnu: Throw error when extending services that do not use extensions. References: In-Reply-To: Resent-From: Richard Sent Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Jul 2024 22:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71928 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71928@debbugs.gnu.org Cc: Richard Sent Received: via spool by 71928-submit@debbugs.gnu.org id=B71928.172004530928707 (code B ref 71928); Wed, 03 Jul 2024 22:22:02 +0000 Received: (at 71928) by debbugs.gnu.org; 3 Jul 2024 22:21:49 +0000 Received: from localhost ([127.0.0.1]:40945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP8MG-0007Sx-Od for submit@debbugs.gnu.org; Wed, 03 Jul 2024 18:21:49 -0400 Received: from mail-108-mta152.mxroute.com ([136.175.108.152]:42657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP8ME-0007Sn-2k for 71928@debbugs.gnu.org; Wed, 03 Jul 2024 18:21:47 -0400 Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta152.mxroute.com (ZoneMTA) with ESMTPSA id 1907ab05f2b00017a3.001 for <71928@debbugs.gnu.org> (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Wed, 03 Jul 2024 22:21:37 +0000 X-Zone-Loop: 8ed322636e3f31ca1675d7add40073809ec2609cf187 X-Originating-IP: [136.175.111.3] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=freakingpenguin.com; s=x; h=Content-Transfer-Encoding:MIME-Version: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=IycA4m6sJDJ7HMmKKGo9VPzfREj0CtantMOBzTnPAVo=; b=V0CCjjFhS3sySK98LmudQur583 zfQs75vCTzFSRsTW1Tnp3oDbmPX+/cmlYFCp84GUcyaF4j2ukCR2RC+JHZUdYT4hOWnyiyiq4oW4x YlSYFnsnNOmU2RDg6cdjNhaQt39oNM/0mb+mZDOTTSj9604y21ieS6XeVbZsC/13kWWuStoaYrWje ovDdrajQiq0xAcgijB3yCJa5sPPhzLDM9r0F3GteeXtXfsppBpLNyC3n5GuoAEkW2cpLu9Bexdf+9 JF4qYT8nxbWcBFoCJ/TJMTgsXenchCCuomytcd0Jk/Vx/hqgWjdGCkLbBwgtr86cRlsqMx2e2Cpk9 pXYgTGrA==; From: Richard Sent Date: Wed, 3 Jul 2024 18:21:01 -0400 Message-ID: <6afb44e7f09f2d8fdbbe4cd0bad92ca170aef1b0.1720045261.git.richard@freakingpenguin.com> MIME-Version: 1.0 X-Authenticated-Id: richard@freakingpenguin.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services.scm (fold-services): Add error handling when using service extensions. Fixes: https://issues.guix.gnu.org/71887 Change-Id: Ic8d631674bfddde495c93952d9e6cd5649bb287d --- gnu/services.scm | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) base-commit: 85012e64819b39fd6112038134548b415fd5daff diff --git a/gnu/services.scm b/gnu/services.scm index 88593e8091..f3a1041f14 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -53,6 +53,7 @@ (define-module (gnu services) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (srfi srfi-71) + #:use-module (ice-9 format) #:use-module (ice-9 vlist) #:use-module (ice-9 match) #:autoload (ice-9 pretty-print) (pretty-print) @@ -1223,12 +1224,22 @@ (define* (fold-services services (params -> (service-value sink)) (service -> - ;; Distinguish COMPOSE and EXTEND because PARAMS typically - ;; has a different type than the elements of EXTENSIONS. - (if extend - (service (service-kind sink) - (extend params (compose extensions))) - sink))) + (begin + (unless (or (null? extensions) + ;; A value of #t is a convention for "make + ;; sure the service is present." + (every (cut eq? #t <>) extensions) + (and extend compose)) + (error (format #f "Extensions are not supported in \ +~a yet the following service types extend it:~{~% ~a~}" + (service-kind sink) + (map service-kind dependents)))) + ;; Distinguish COMPOSE and EXTEND because PARAMS typically + ;; has a different type than the elements of EXTENSIONS. + (if extend + (service (service-kind sink) + (extend params (compose extensions))) + sink)))) (mbegin %state-monad (set-current-state (vhash-consq sink service visited)) (return service))))