From patchwork Fri Jun 2 14:22:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 50545 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 E4E6327BBEA; Fri, 2 Jun 2023 15:23:44 +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=ham 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 B776727BBE2 for ; Fri, 2 Jun 2023 15:23:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q55gH-0007hN-6a; Fri, 02 Jun 2023 10:23:05 -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 1q55gF-0007g7-Og for guix-patches@gnu.org; Fri, 02 Jun 2023 10:23:03 -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 1q55gF-0001gO-Gb for guix-patches@gnu.org; Fri, 02 Jun 2023 10:23:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q55gF-0005WJ-8I for guix-patches@gnu.org; Fri, 02 Jun 2023 10:23:03 -0400 Subject: bug#63538: [PATCH] gnu: services: Error in MODIFY-SERVICES when services don't exist Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Fri, 02 Jun 2023 14:23:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 63538 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brian Cully Cc: 63538-done@debbugs.gnu.org Mail-Followup-To: 63538@debbugs.gnu.org, ludo@gnu.org, bjc@spork.org Received: via spool by 63538-done@debbugs.gnu.org id=D63538.168571577521171 (code D ref 63538); Fri, 02 Jun 2023 14:23:03 +0000 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: Ludovic =?utf-8?q?Court=C3=A8s?= 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 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 Hi Brian, Applied with the minor change below. Thanks for working on this! Ludo’. 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 © 2021 raid5atemyhomework ;;; Copyright © 2020 Christine Lemmer-Webber ;;; Copyright © 2020, 2021 Brice Waegeneire +;;; Copyright © 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)))))) (define-syntax %apply-clauses (syntax-rules (=> delete)