From debbugs-submit-bounces@debbugs.gnu.org Tue May 16 11:39:59 2023 Received: (at submit) by debbugs.gnu.org; 16 May 2023 15:39:59 +0000 Received: from localhost ([127.0.0.1]:47003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pywmN-0002gr-0v for submit@debbugs.gnu.org; Tue, 16 May 2023 11:39:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:36406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pywmJ-0002gi-KR for submit@debbugs.gnu.org; Tue, 16 May 2023 11:39:57 -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 1pywmJ-00053D-Bb for guix-patches@gnu.org; Tue, 16 May 2023 11:39:55 -0400 Received: from coleridge.kublai.com ([166.84.7.167] helo=mail.spork.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pywmH-0000a5-R9 for guix-patches@gnu.org; Tue, 16 May 2023 11:39:55 -0400 Received: from psyduck.jhoto.kublai.com (ool-18b8e9e7.dyn.optonline.net [24.184.233.231]) by mail.spork.org (Postfix) with ESMTPSA id BEA7FA74E; Tue, 16 May 2023 11:39:41 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1684251582; bh=hxk+inCuFrsozG8yBZ/fh8ZBc7VPOkKQkLgLow1kRoU=; h=From:To:Cc:Subject:Date; b=HbmO5axiZ+hy2Lu8aOb3AtX6olqbFBXeGs1WS9zgrqGGM9/payO0Pg64cUaqhPiGI JmoBQdigQRwPSQkbcuwXl0si+I8Ep0oA8MtaOrdhcHW5VykROv/gzaiYufkwfhLDC3 0eyq1YRNl2kWMF/7zG3P7TV5hd8xmhwckJCyzwL0= From: Brian Cully To: guix-patches@gnu.org Subject: [PATCH 1/3] tests: Add tests for MODIFY-SERVICES procedure Date: Tue, 16 May 2023 11:39:37 -0400 Message-Id: <999ea3ff3ea32e4e1bb8b7b8abd4e0e29d1f2395.1684251578.git.bjc@spork.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=166.84.7.167; envelope-from=bjc@spork.org; helo=mail.spork.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Brian Cully X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * tests/services.scm ("modify-services: do nothing") ("modify-services: delete service") ("modify-services: change value"): New tests. --- tests/services.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/tests/services.scm b/tests/services.scm index 8e35758209..435f39e59b 100644 --- a/tests/services.scm +++ b/tests/services.scm @@ -286,4 +286,54 @@ (define-module (test-services) ((one) one) (x x)))) +(test-equal "modify-services: do nothing" + '(1 2 3) + (let* ((t1 (service-type (name 't1) + (extensions '()) + (description ""))) + (t2 (service-type (name 't2) + (extensions '()) + (description ""))) + (t3 (service-type (name 't3) + (extensions '()) + (description ""))) + (services (list (service t1 1) (service t2 2) (service t3 3)))) + (sort (map service-value + (modify-services services)) + <))) + +(test-equal "modify-services: delete service" + '(1 3) + (let* ((t1 (service-type (name 't1) + (extensions '()) + (description ""))) + (t2 (service-type (name 't2) + (extensions '()) + (description ""))) + (t3 (service-type (name 't3) + (extensions '()) + (description ""))) + (services (list (service t1 1) (service t2 2) (service t3 3)))) + (sort (map service-value + (modify-services services + (delete t2))) + <))) + +(test-equal "modify-services: change value" + '(1 2 33) + (let* ((t1 (service-type (name 't1) + (extensions '()) + (description ""))) + (t2 (service-type (name 't2) + (extensions '()) + (description ""))) + (t3 (service-type (name 't3) + (extensions '()) + (description ""))) + (services (list (service t1 1) (service t2 2) (service t3 3)))) + (sort (map service-value + (modify-services services + (t3 value => 33))) + <))) + (test-end) base-commit: b363fab46f5af42b3f653e2fee1834477bd5aacd prerequisite-patch-id: 8a03c5e8bcd4c526b93c558d550725887f932e41 prerequisite-patch-id: 89400c29b4c30dfbe8492aff1751ca583397b4f0 prerequisite-patch-id: a1963f772e753239b80e6a7b0d9f55e0ab4d662b prerequisite-patch-id: b047430c30ba9ea274aea33a467cdb49d769884e -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Tue May 16 11:41:54 2023 Received: (at 63538) by debbugs.gnu.org; 16 May 2023 15:41:54 +0000 Received: from localhost ([127.0.0.1]:47012 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pywoE-0002kV-HJ for submit@debbugs.gnu.org; Tue, 16 May 2023 11:41:54 -0400 Received: from coleridge.kublai.com ([166.84.7.167]:64233 helo=mail.spork.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pywoC-0002kL-0T for 63538@debbugs.gnu.org; Tue, 16 May 2023 11:41:52 -0400 Received: from psyduck.jhoto.kublai.com (ool-18b8e9e7.dyn.optonline.net [24.184.233.231]) by mail.spork.org (Postfix) with ESMTPSA id CA9F4A5B2; Tue, 16 May 2023 11:41:51 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1684251711; bh=ikE1xPgGYduWuSPJH+JWsPYbaanAKw81Oosrc+MuUeM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jugEo8KMCirYetYWTYfFaaNNV41FrNvad2+1pv2CmzV3x0269E8ypO36eH08W7EYA 2oKSDHLyyyHD0rKFEzdQToZfp+6iiaCv0RG/3pemvYpavuwwJKMpggV61KMGihSFwG DR6P+LOkwVWDsgqn6LQC8k5SNbmssXiuPKONRopo= From: Brian Cully To: 63538@debbugs.gnu.org Subject: [PATCH 2/3] tests: Check for service existence in MODIFY-SERVICES Date: Tue, 16 May 2023 11:41:41 -0400 Message-Id: <4de40059943bdd7fa6cc45a70a9cd1087edad57d.1684251702.git.bjc@spork.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <999ea3ff3ea32e4e1bb8b7b8abd4e0e29d1f2395.1684251702.git.bjc@spork.org> References: <999ea3ff3ea32e4e1bb8b7b8abd4e0e29d1f2395.1684251702.git.bjc@spork.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63538 Cc: Brian Cully X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * tests/services.scm ("modify-services: delete non-existing service") ("modify-services: change value for non-existing service"): New tests. --- tests/services.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tests/services.scm b/tests/services.scm index 435f39e59b..5a9cd47489 100644 --- a/tests/services.scm +++ b/tests/services.scm @@ -319,6 +319,21 @@ (define-module (test-services) (delete t2))) <))) +(test-error "modify-services: delete non-existing service" + #t + (let* ((t1 (service-type (name 't1) + (extensions '()) + (description ""))) + (t2 (service-type (name 't2) + (extensions '()) + (description ""))) + (t3 (service-type (name 't2) + (extensions '()) + (description ""))) + (services (list (service t1 1) (service t2 2)))) + (modify-services services + (delete t3)))) + (test-equal "modify-services: change value" '(1 2 33) (let* ((t1 (service-type (name 't1) @@ -336,4 +351,20 @@ (define-module (test-services) (t3 value => 33))) <))) +(test-error "modify-services: change value for non-existing service" + #t + (let* ((t1 (service-type (name 't1) + (extensions '()) + (description ""))) + (t2 (service-type (name 't2) + (extensions '()) + (description ""))) + (t3 (service-type (name 't3) + (extensions '()) + (description ""))) + (services (list (service t1 1) (service t3 3)))) + (map service-value + (modify-services services + (t2 value => 22))))) + (test-end) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Tue May 16 11:41:57 2023 Received: (at 63538) by debbugs.gnu.org; 16 May 2023 15:41:57 +0000 Received: from localhost ([127.0.0.1]:47014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pywoG-0002kk-SD for submit@debbugs.gnu.org; Tue, 16 May 2023 11:41:57 -0400 Received: from coleridge.kublai.com ([166.84.7.167]:58179 helo=mail.spork.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pywoE-0002kU-5s for 63538@debbugs.gnu.org; Tue, 16 May 2023 11:41:54 -0400 Received: from psyduck.jhoto.kublai.com (ool-18b8e9e7.dyn.optonline.net [24.184.233.231]) by mail.spork.org (Postfix) with ESMTPSA id 01292A753; Tue, 16 May 2023 11:41:53 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1684251714; bh=TpDxmyOBFJGOK8zw0jml7uH4HGnwt/1CMv3Xvfet96w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VoHH2LJVyMKlSOlpDR6rP+TQNoHKs4lWc5aWQSvsQeeYYWE183e63i5Q+XNySxahK nF9MmLsKkpMOmmYf4RaB/+PgaQvwtC0CcHP/SYiL0ue0yg3cRSnbVa+cwMMp6S/4Ns 8yUaSKflFpUPzJSgjSC4YD1OybEy0+akXpb2Eyhk= From: Brian Cully To: 63538@debbugs.gnu.org Subject: [PATCH 3/3] gnu: services: Error in MODIFY-SERVICES when services don't exist Date: Tue, 16 May 2023 11:41:42 -0400 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: <999ea3ff3ea32e4e1bb8b7b8abd4e0e29d1f2395.1684251702.git.bjc@spork.org> References: <999ea3ff3ea32e4e1bb8b7b8abd4e0e29d1f2395.1684251702.git.bjc@spork.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63538 Cc: Brian Cully X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 d6c7ad0553..988325b253 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 ...)) + 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 From debbugs-submit-bounces@debbugs.gnu.org Tue May 16 13:54:13 2023 Received: (at control) by debbugs.gnu.org; 16 May 2023 17:54:13 +0000 Received: from localhost ([127.0.0.1]:47709 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyysH-0000hM-0h for submit@debbugs.gnu.org; Tue, 16 May 2023 13:54:13 -0400 Received: from coleridge.kublai.com ([166.84.7.167]:62809 helo=mail.spork.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyysF-0000hE-I1 for control@debbugs.gnu.org; Tue, 16 May 2023 13:54:11 -0400 Received: from psyduck (ool-18b8e9e7.dyn.optonline.net [24.184.233.231]) by mail.spork.org (Postfix) with ESMTPSA id 39A39A7DD for ; Tue, 16 May 2023 13:54:09 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1684259650; bh=GsMKcYHRupHdRYInxUVQVI1DX+7BP3+pIblx+r2GF/4=; h=Date:To:From:Subject; b=C458gTyLdVmhyDMrKWSpcrhVP7YnVKQT03J4TPQtiFQ3U2pzhQsFHbZyAWCB9zQ6G 4BTifD+fpKQOc4fCa7LwFHw1a7+nAvNeIVpEzmasMTVYPwR1bik9LF0xnuWBVJPfJS ir9HPlACjfX3ifIAuR4ZeM5fVjbMQ54TR7bnA5WY= Date: Tue, 16 May 2023 13:54:09 -0400 Message-Id: <878rdoqi0u.fsf@psyduck.jhoto.kublai.com> To: control@debbugs.gnu.org From: Brian Cully Subject: control message for bug #63538 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) retitle 63538 [PATCH] gnu: services: Error in MODIFY-SERVICES when services don't exist quit From debbugs-submit-bounces@debbugs.gnu.org Fri May 26 18:28:11 2023 Received: (at 63538) by debbugs.gnu.org; 26 May 2023 22:28:11 +0000 Received: from localhost ([127.0.0.1]:50960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2fus-0007zr-US for submit@debbugs.gnu.org; Fri, 26 May 2023 18:28:11 -0400 Received: from coleridge.kublai.com ([166.84.7.167]:56161 helo=mail.spork.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2fuq-0007zi-Hk for 63538@debbugs.gnu.org; Fri, 26 May 2023 18:28:09 -0400 Received: from psyduck (ool-18b8e9e7.dyn.optonline.net [24.184.233.231]) by mail.spork.org (Postfix) with ESMTPSA id E62ADBEE1 for <63538@debbugs.gnu.org>; Fri, 26 May 2023 18:27:59 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1685140086; bh=zTR7jyNlzW/7Kl39+buPDY58pC0WHod7aFlBeLotwm0=; h=From:To:Subject:In-Reply-To:References:Date; b=FL6tx5rzcZqgfrz5sIWo76GAHy2iDxNK/FVihq6zyO+Ij4n6pZMOWx9/mxgAvUz4B j3F/+PVPMr1KIlcuJXW8DzMBajZbNv0E72aAKp/DKaJuzTu28R/pvl6fP/PDs1zIpJ NKzCZiyafnBxe34C/XKjmeDBR8TUGdMtDWpfob/E= From: Brian Cully To: 63538@debbugs.gnu.org Subject: Re: bug#63538: [PATCH] gnu: services: Error in MODIFY-SERVICES when services don't exist In-Reply-To: (Brian Cully's message of "Tue, 16 May 2023 11:41:42 -0400") References: <999ea3ff3ea32e4e1bb8b7b8abd4e0e29d1f2395.1684251702.git.bjc@spork.org> Date: Fri, 26 May 2023 18:27:59 -0400 Message-ID: <87o7m6ybgw.fsf_-_@psyduck.jhoto.kublai.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63538 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) The previous patch is incorrect, because it didn't continue recursing after a modify rule. The next set fixes that, and adds a test for it. From debbugs-submit-bounces@debbugs.gnu.org Fri May 26 18:30:25 2023 Received: (at 63538) by debbugs.gnu.org; 26 May 2023 22:30:25 +0000 Received: from localhost ([127.0.0.1]:50967 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2fx3-000853-DL for submit@debbugs.gnu.org; Fri, 26 May 2023 18:30:25 -0400 Received: from coleridge.kublai.com ([166.84.7.167]:61703 helo=mail.spork.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2fx1-00084j-FC for 63538@debbugs.gnu.org; Fri, 26 May 2023 18:30:23 -0400 Received: from psyduck.jhoto.kublai.com (ool-18b8e9e7.dyn.optonline.net [24.184.233.231]) by mail.spork.org (Postfix) with ESMTPSA id 4C0D1BF69; Fri, 26 May 2023 18:30:23 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1685140223; bh=hplE5y/5zGGoOlYdJDfrP/08gwhoEKJlQ6NQFvoHzoo=; h=From:To:Cc:Subject:Date; b=oX/Ueu7vwReP/tXiZDqo4QgKB83vKVt0r7tkbXjLspms45lO9dG7HFyPZ2gGx5Gqg 9q35Vsc7HH78/zJhl0lx/lo21q3El11Msm+wNMH5Gzgg7rLQ2iUgKmH8yD5dO1mGjl T52ImPMmwtdiPpXkMfJdDDf+X/zwmd2RzTBbw/FU= From: Brian Cully To: 63538@debbugs.gnu.org Subject: [PATCH v2 1/3] tests: Add tests for MODIFY-SERVICES procedure Date: Fri, 26 May 2023 18:30:15 -0400 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63538 Cc: Brian Cully X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * tests/services.scm ("modify-services: do nothing") ("modify-services: delete service") ("modify-services: change value"): New tests. --- tests/services.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/tests/services.scm b/tests/services.scm index 8e35758209..435f39e59b 100644 --- a/tests/services.scm +++ b/tests/services.scm @@ -286,4 +286,54 @@ (define-module (test-services) ((one) one) (x x)))) +(test-equal "modify-services: do nothing" + '(1 2 3) + (let* ((t1 (service-type (name 't1) + (extensions '()) + (description ""))) + (t2 (service-type (name 't2) + (extensions '()) + (description ""))) + (t3 (service-type (name 't3) + (extensions '()) + (description ""))) + (services (list (service t1 1) (service t2 2) (service t3 3)))) + (sort (map service-value + (modify-services services)) + <))) + +(test-equal "modify-services: delete service" + '(1 3) + (let* ((t1 (service-type (name 't1) + (extensions '()) + (description ""))) + (t2 (service-type (name 't2) + (extensions '()) + (description ""))) + (t3 (service-type (name 't3) + (extensions '()) + (description ""))) + (services (list (service t1 1) (service t2 2) (service t3 3)))) + (sort (map service-value + (modify-services services + (delete t2))) + <))) + +(test-equal "modify-services: change value" + '(1 2 33) + (let* ((t1 (service-type (name 't1) + (extensions '()) + (description ""))) + (t2 (service-type (name 't2) + (extensions '()) + (description ""))) + (t3 (service-type (name 't3) + (extensions '()) + (description ""))) + (services (list (service t1 1) (service t2 2) (service t3 3)))) + (sort (map service-value + (modify-services services + (t3 value => 33))) + <))) + (test-end) base-commit: 1be6baed2b58a75868cdcc9f51b78624c2fefc4f -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri May 26 18:30:26 2023 Received: (at 63538) by debbugs.gnu.org; 26 May 2023 22:30:26 +0000 Received: from localhost ([127.0.0.1]:50969 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2fx3-000855-Ne for submit@debbugs.gnu.org; Fri, 26 May 2023 18:30:26 -0400 Received: from coleridge.kublai.com ([166.84.7.167]:59415 helo=mail.spork.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2fx1-00084k-TJ 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 ADA54BEE2; Fri, 26 May 2023 18:30:23 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1685140223; bh=t9xUK4xqIkXvRG2F8P0RE1fk55OZAVeF22NNXcTTZpE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=X7kgb3PmQChuYjQWN+4M4jyia6IMGf17CaJN6ihRjQWanUoiHieTitDT0e1Ff+vfg A2O4YDv07c7L7AHASlkoJUDiAExIgRhevBCrXJIQ4N0o73xgAfZbOdb3E/iJRk5EY5 fSJxb2qNx55FxW6lb7SjZb4/BcloZOMaS+rj1nrM= From: Brian Cully To: 63538@debbugs.gnu.org Subject: [PATCH v2 2/3] tests: Check for service existence in MODIFY-SERVICES Date: Fri, 26 May 2023 18:30:16 -0400 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63538 Cc: Brian Cully X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * tests/services.scm ("modify-services: delete non-existing service") ("modify-services: change value for non-existing service"): New tests. --- tests/services.scm | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/tests/services.scm b/tests/services.scm index 435f39e59b..8cdb1b2a31 100644 --- a/tests/services.scm +++ b/tests/services.scm @@ -303,7 +303,7 @@ (define-module (test-services) <))) (test-equal "modify-services: delete service" - '(1 3) + '(1) (let* ((t1 (service-type (name 't1) (extensions '()) (description ""))) @@ -316,11 +316,27 @@ (define-module (test-services) (services (list (service t1 1) (service t2 2) (service t3 3)))) (sort (map service-value (modify-services services + (delete t3) (delete t2))) <))) +(test-error "modify-services: delete non-existing service" + #t + (let* ((t1 (service-type (name 't1) + (extensions '()) + (description ""))) + (t2 (service-type (name 't2) + (extensions '()) + (description ""))) + (t3 (service-type (name 't2) + (extensions '()) + (description ""))) + (services (list (service t1 1) (service t2 2)))) + (modify-services services + (delete t3)))) + (test-equal "modify-services: change value" - '(1 2 33) + '(2 11 33) (let* ((t1 (service-type (name 't1) (extensions '()) (description ""))) @@ -333,7 +349,24 @@ (define-module (test-services) (services (list (service t1 1) (service t2 2) (service t3 3)))) (sort (map service-value (modify-services services + (t1 value => 11) (t3 value => 33))) <))) +(test-error "modify-services: change value for non-existing service" + #t + (let* ((t1 (service-type (name 't1) + (extensions '()) + (description ""))) + (t2 (service-type (name 't2) + (extensions '()) + (description ""))) + (t3 (service-type (name 't3) + (extensions '()) + (description ""))) + (services (list (service t1 1) (service t3 3)))) + (map service-value + (modify-services services + (t2 value => 22))))) + (test-end) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Fri May 26 18:30:31 2023 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= From: Brian Cully To: 63538@debbugs.gnu.org Subject: [PATCH v2 3/3] gnu: services: Error in MODIFY-SERVICES when services don't exist 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63538 Cc: Brian Cully X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 02 10:22:55 2023 Received: (at 63538-done) by debbugs.gnu.org; 2 Jun 2023 14:22:55 +0000 Received: from localhost ([127.0.0.1]:40589 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q55g6-0005VP-Sm for submit@debbugs.gnu.org; Fri, 02 Jun 2023 10:22:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51246) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q55g4-0005VB-4u for 63538-done@debbugs.gnu.org; Fri, 02 Jun 2023 10:22:53 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q55fy-0001dY-QN; Fri, 02 Jun 2023 10:22:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=wlOd0hAvK4na6Uaz6Lq6X8TXGYV4/52fOL86l8U+dQI=; b=WowQ2zL2nWhcmDtpQPrW Ou96Xw/u/sjK9SXXaRX+hGMMkEghPmqAXmhnsBJLplHyFrkcHZ0OsrZi7ph1SmtwzDWUKXW89O7id tBZcjxgUexOX71yEz2hb3XU34Ez3pSVeOnkEc2spdrUYQHsteud5U/UbbDLtgjet02Ob1nMbenj4p kmZItuRoVjLek2NnqplhMB+J7tXbnFoMeuHia5E60+1BNUSEGJvmcxUtttYa61DG9c3bGUO2rFhIz Mgy7s1bDN2XVR/Uv2oCoYAz6D6WxiJBLvfEZpM91eHNLO+Ok+c6P0s8qLMxhFj1D8DL0Q9X3IPQ6v jfaPIXVOVJcb3g==; Received: from [193.50.110.155] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q55fy-0002eU-Dg; Fri, 02 Jun 2023 10:22:46 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Brian Cully Subject: Re: bug#63538: [PATCH] gnu: services: Error in MODIFY-SERVICES when services don't exist References: <13ab94bbed475a933d8376ad8fc166c6ad124b67.1685140217.git.bjc@spork.org> Date: Fri, 02 Jun 2023 16:22:44 +0200 In-Reply-To: <13ab94bbed475a933d8376ad8fc166c6ad124b67.1685140217.git.bjc@spork.org> (Brian Cully's message of "Fri, 26 May 2023 18:30:17 -0400") Message-ID: <87wn0m3pvv.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 63538-done Cc: 63538-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Brian, Applied with the minor change below. Thanks for working on this! Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable diff --git a/gnu/services.scm b/gnu/services.scm index a58cffe536..a990d297c9 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -6,6 +6,7 @@ ;;; Copyright =C2=A9 2021 raid5atemyhomework ;;; Copyright =C2=A9 2020 Christine Lemmer-Webber ;;; Copyright =C2=A9 2020, 2021 Brice Waegeneire +;;; Copyright =C2=A9 2023 Brian Cully ;;; ;;; This file is part of GNU Guix. ;;; @@ -307,10 +308,10 @@ (define (%delete-service kind services) (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)))))) + ((service . rest) + (if (eq? (service-kind service) kind) + (loop service return rest) + (loop found (cons service return) rest)))))) =20 (define-syntax %apply-clauses (syntax-rules (=3D> delete) --=-=-=-- From unknown Thu Sep 11 11:35:33 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 01 Jul 2023 11:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator