From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 4LgcNkgzcWQJZwEASxT56A (envelope-from ) for ; Sat, 27 May 2023 00:31:36 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id EEwYNkgzcWTwFQAA9RJhRA (envelope-from ) for ; Sat, 27 May 2023 00:31:36 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5472F2AF28 for ; Sat, 27 May 2023 00:31:36 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2fxo-0003ui-LJ; Fri, 26 May 2023 18:31:13 -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 1q2fxf-0003sp-AR for guix-patches@gnu.org; Fri, 26 May 2023 18:31:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2fxe-0003AL-Pr for guix-patches@gnu.org; Fri, 26 May 2023 18:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q2fxe-00086R-IS for guix-patches@gnu.org; Fri, 26 May 2023 18:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63538] [PATCH v2 3/3] gnu: services: Error in MODIFY-SERVICES when services don't exist Resent-From: Brian Cully Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 26 May 2023 22:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63538 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63538@debbugs.gnu.org Cc: Brian Cully Received: via spool by 63538-submit@debbugs.gnu.org id=B63538.168514023131092 (code B ref 63538); Fri, 26 May 2023 22:31:02 +0000 Received: (at 63538) by debbugs.gnu.org; 26 May 2023 22:30:31 +0000 Received: from localhost ([127.0.0.1]:50971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2fx9-00085Q-42 for submit@debbugs.gnu.org; Fri, 26 May 2023 18:30:31 -0400 Received: from coleridge.kublai.com ([166.84.7.167]:63834 helo=mail.spork.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2fx2-00084s-AW for 63538@debbugs.gnu.org; Fri, 26 May 2023 18:30:24 -0400 Received: from psyduck.jhoto.kublai.com (ool-18b8e9e7.dyn.optonline.net [24.184.233.231]) by mail.spork.org (Postfix) with ESMTPSA id 22EA7BEE3; Fri, 26 May 2023 18:30:24 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1685140224; bh=jkzBQVpzQldllzZ/W1qwHhXun/BknWAYdplHnxXnZDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rRmlHYCuos321eCeis8XJQSa197QbyFM/mB0hwABZOIS1Ssu3zknxv7aCOCFo2mTK PMNP+iqry1bX5Pev3YI5bUi5Koh0OfmKmOFhu9vpcOflIca3NwQTcZaoriv16xq6CQ K8chy/motQNdesjfn7h0iVFau0s6A0O+UcQjW8PU= Date: Fri, 26 May 2023 18:30:17 -0400 Message-Id: <13ab94bbed475a933d8376ad8fc166c6ad124b67.1685140217.git.bjc@spork.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Reply-to: Brian Cully X-ACL-Warn: , Brian Cully via Guix-patches From: Brian Cully via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1685140296; a=rsa-sha256; cv=none; b=B6lYgWKtBSrUWZK8o9OfwX3fG7urhDCqWPOCGLW35w4Ku5KT8BLvcAKPniASajLaiCoRzv rv6A73SsdsFvb0JMwkfFvM5UCRIYflCAlQvjvmw7cngv/bxxXP5mQmw9KZvnWrUDwNLPwv xYA5Baga4Hvc2hEVG9xvZkR4T41HbIFZgvGw5u0QPVuITs9y3CR6pIMBtoMB+uC/FFULRu CtvbvdleSlFbaF0jFd/5/wl78idWmdWEw9//ontlMT+qZOGFRlHQsXWTAb0y53OY0BkYMh H7O5POpQsDbhEEg82SAXnHCHMJuWKJPJg5n76HsL9DmlL1nCgBxuzyPNo8lPSA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=spork.org header.s=dkim header.b=rRmlHYCu; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1685140296; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ZWh15+c0LbwSKfOr43uV9P2j7mHZjRrCxXc/vLSplsw=; b=sOCWPnLOl8zLs8ZXFdZLoBEMRJXFgA9ix53wwBI1QhDP+6sDbgrQYwcgNkit3BkIG+nvsH mHSBXE96C5L0c/i0m6mqhCtg7gCodc6SGQ1PlQIR1UjtDw5W7tM/NiQDIgh++JmbiqttOZ cXuykV4S1TfneEs8m5pcop+YBwgN0as36OAkvgLfWBzr1EcpYaN5rP8NKwGKsKSi5JM+KC LxZG/jkb2xu1buXtGVo0/xA9wWQqPMkq+ZOWqaw6LcF3FFaPSXH9r29H9cBgW7MsFN0ypm nzwXmFpincGEfpSBwZ/VGiLxm4l8Zfyj1IryJrXnMwuwNVgJXz1xoM8wx+ZdNw== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=spork.org header.s=dkim header.b=rRmlHYCu; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.66 X-Spam-Score: -1.66 X-Migadu-Queue-Id: 5472F2AF28 X-TUID: Qs8aS9bNgW7S This patch causes MODIFY-SERVICES to raise an error if a reference is made to a service which isn't in its service list. This it to help users notice if they have an invalid rule, which is currently silently ignored. * gnu/services.scm (%delete-service): new procedure (%apply-clauses): new syntax rule (%modify-service): remove syntax rule --- gnu/services.scm | 47 ++++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/gnu/services.scm b/gnu/services.scm index 31eba9f035..a58cffe536 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -296,20 +296,35 @@ (define (simple-service name target value) (description "This is a simple service.")))) (service type value))) -(define-syntax %modify-service +(define (%delete-service kind services) + (let loop ((found #f) + (return '()) + (services services)) + (match services + ('() + (if found + (values return found) + (raise (formatted-message + (G_ "modify-services: service '~a' not found in service list") + (service-type-name kind))))) + ((svc . rest) + (if (eq? (service-kind svc) kind) + (loop svc return rest) + (loop found (cons svc return) rest)))))) + +(define-syntax %apply-clauses (syntax-rules (=> delete) - ((_ svc (delete kind) clauses ...) - (if (eq? (service-kind svc) kind) - #f - (%modify-service svc clauses ...))) - ((_ service) - service) - ((_ svc (kind param => exp ...) clauses ...) - (if (eq? (service-kind svc) kind) - (let ((param (service-value svc))) - (service (service-kind svc) - (begin exp ...))) - (%modify-service svc clauses ...))))) + ((_ ((delete kind) . rest) services) + (%apply-clauses rest (%delete-service kind services))) + ((_ ((kind param => exp ...) . rest) services) + (call-with-values (lambda () (%delete-service kind services)) + (lambda (svcs found) + (let ((param (service-value found))) + (cons (service (service-kind found) + (begin exp ...)) + (%apply-clauses rest svcs)))))) + ((_ () services) + services))) (define-syntax modify-services (syntax-rules () @@ -345,10 +360,8 @@ (define-syntax modify-services UDEV-SERVICE-TYPE. This is a shorthand for (filter-map (lambda (svc) ...) %base-services)." - ((_ services clauses ...) - (filter-map (lambda (service) - (%modify-service service clauses ...)) - services)))) + ((_ services . clauses) + (%apply-clauses clauses services)))) ;;; -- 2.40.1