From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 01 03:53:35 2021 Received: (at submit) by debbugs.gnu.org; 1 Nov 2021 07:53:35 +0000 Received: from localhost ([127.0.0.1]:33616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhS8N-0005j2-8u for submit@debbugs.gnu.org; Mon, 01 Nov 2021 03:53:35 -0400 Received: from lists.gnu.org ([209.51.188.17]:33916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhS8M-0005iu-3S for submit@debbugs.gnu.org; Mon, 01 Nov 2021 03:53:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhS8L-0007EU-Sk for guix-patches@gnu.org; Mon, 01 Nov 2021 03:53:33 -0400 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]:39738) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mhS8J-0001bs-Ij for guix-patches@gnu.org; Mon, 01 Nov 2021 03:53:33 -0400 Received: by mail-lf1-x130.google.com with SMTP id l13so34738741lfg.6 for ; Mon, 01 Nov 2021 00:53:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop-in.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:mime-version; bh=840J6KknOjvKnUde/W72XKcbRwrL4VvlJtJg6arQ29E=; b=VRjz3oVxtQ8jwMAyYbOFSyxmO5NMBq/4QgtLBKW+wX+tvqB+xXszLht161tFDsQHwX P5crFPqj0d31ivqPr49uGU2s646sruwL+yaq1SDfBG9hXzKaOQikp9BM2uHGfALZq7C+ kT4xoiqdj5G+GAuYFsTWwphAeAJ3L9ugBfR5IfKNwzKYcwzFZ9318X4zPbMQP+37DrnM 2KA6qnBl4GoppJqvvHx/rFLtBZcRU6IG32MnnQtxpRk3iOCqC34qZjZf2PVFEnaiipy1 NlnVibRY6wOl5cY/3DpVNtwKvA1xeaQBVshxalygSnagabAT1Uv5iR+/VwPFH3w5oszw 31IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=840J6KknOjvKnUde/W72XKcbRwrL4VvlJtJg6arQ29E=; b=XzQPTzxNAGD9Ni6DiD4cKz4aRK+Y1xVY1aKW4d6PgwRUZf5j+0jJgFbKZaiVSxsdjP 68ySN+5xMCNnrXjyfP6ersxFjPZu0MfjxwU+u0CFjaTTC04q300xYSvHmOUHNXDzYdfD kINczuZ5tXUkLOtpDFXiPLpwIWFuMmBefp0LbxKcmRq1H4OPEd/NIQrowRzL4iDJ31Nk BWvsTO5AK16nqFfnUW3ojotqe7PL12E9iWdax2tT2XDBPHkvFY8Pv+q+NJRJKbA7Jbfa zIrDhOv4Gia4UB4iXjErGrJuRJCrgN8hZWZhoOEAojChIJVrKtQZo5w1bTct/M9sDLVj BAnQ== X-Gm-Message-State: AOAM530YhptPG7djG/uZR0rB2nTog9Oy52UUM8fxvEVxp4644c22Wl8h Rq3sUaeZjJltFHyFm9eSlOp/eK68A0Rzwg== X-Google-Smtp-Source: ABdhPJx145DWFGAZb7pfMNXeYB57xMz7TzeYMFsIF2P4Q8qaOLwsoGBVPR4qB7tvMEqOHfYsvDoyFA== X-Received: by 2002:a05:6512:3092:: with SMTP id z18mr25899855lfd.396.1635753209003; Mon, 01 Nov 2021 00:53:29 -0700 (PDT) Received: from localhost (109-252-140-132.dynamic.spd-mgts.ru. [109.252.140.132]) by smtp.gmail.com with ESMTPSA id f7sm258463lfs.38.2021.11.01.00.53.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 00:53:28 -0700 (PDT) From: Andrew Tropin To: guix-patches@gnu.org, Oleg Pykhalov Subject: [PATCH] services: configuration: Fix interpose implementation. Date: Mon, 1 Nov 2021 10:43:12 +0300 Message-ID: <875ytctiq2.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: none client-ip=2a00:1450:4864:20::130; envelope-from=andrew@trop.in; helo=mail-lf1-x130.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit 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 Content-Transfer-Encoding: quoted-printable * gnu/services/configuration.scm (interpose, serialize-text-config): Fix interpose implementation, move file-like object code to serialize-text-config. =2D-- This gexp reading file-like object content doesn't belong to interpose function, moved that part of code out of it. gnu/services/configuration.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm index e8c55b6e4d..0de350a4df 100644 =2D-- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -359,10 +359,7 @@ (define* (interpose ls #:optional (delimiter "\n") (g= rammar 'infix)) (G_ "The GRAMMAR value must be 'infix or 'suffix, but ~a provided.") grammar))) (fold-right (lambda (e acc) =2D (cons #~(begin =2D (use-modules (ice-9 rdelim)) =2D (with-fluids ((%default-port-encoding "UTF-8")) =2D (with-input-from-file #$e read-string))) + (cons e (if (and (null? acc) (eq? grammar 'infix)) acc (cons delimiter acc)))) @@ -387,7 +384,16 @@ (define serialize-file-like empty-serializer) (define (text-config? config) (list-of file-like?)) (define (serialize-text-config field-name val) =2D #~(string-append #$@(interpose val "\n" 'suffix))) + #~(string-append + #$@(interpose + (map + (lambda (e) + #~(begin + (use-modules (ice-9 rdelim)) + (with-fluids ((%default-port-encoding "UTF-8")) + (with-input-from-file #$e read-string)))) + val) + "\n" 'suffix))) =20 (define ((generic-serialize-alist-entry serialize-field) entry) "Apply the SERIALIZE-FIELD procedure on the field and value of ENTRY." =2D-=20 2.33.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmF/nPUACgkQIgjSCVjB 3rBCVBAAlMB4oGnXNcoIhz+hgSCFKyPV0jAUfOYBRaxcu+05uq0cmAjfG5YuULoA fCH3fv0DN+gXLgQc/HKWAjkgfDiEZIc83M2KILmq/pKb401wgYbkBdaiE1BGr8qu TgiwJEuL8FnPywSHSm0zW3QGnwQ6LTtsRqxvI2tx6mso4sWb3aJClZhVSjVTtTgF kYdhtxRm/dexVFe9MfkLhK/R579O0IDKq2l/iW7/Ki4zGCFj2K9BC+TB6L3kWafz FB7Z4qsNtiVTkQiW/BZaq5zZYY2alPS7jMmB5SGzcLqjDa7k7DH1d8xrjZwtxU9A YpVxZlqIDekgCCetDQKPiYkfAbS7q8Ql7PY2GPg2MFMjgLpSgYbPWFjDaOWcSo2B //WLS61bujiiaRdgYL1anOZTS2m1uh/9IBi6wWsghn8HgAEVhcCnDWahjrEucLq9 a44QCdAanqS1GDvB9SzM/PJD+ukY5n+ert0BQ66sIUoumrsD6p9UaM1cuDC+GyDM Z5bvvGKyKLQKsgPOHnns9Lg4PbuoNhswm6fWAmHEnqcmxV80WHA1u28YL2NidaL7 QdWWucPUOoYWOQ7YcUYN9ajBqBybAm6nt5Qdc4roOb3ohQrb6XzbPp8l7K34nvsE hwAGPIslzfUs8D91loNbwGcswumKiS57KNOK8KvWNLN2SqmzOGQ= =P6/N -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 01 10:48:40 2021 Received: (at 51541-done) by debbugs.gnu.org; 1 Nov 2021 14:48:41 +0000 Received: from localhost ([127.0.0.1]:35840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhYc4-0004nA-Ps for submit@debbugs.gnu.org; Mon, 01 Nov 2021 10:48:40 -0400 Received: from mail-lj1-f175.google.com ([209.85.208.175]:33491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhYc1-0004mr-7P for 51541-done@debbugs.gnu.org; Mon, 01 Nov 2021 10:48:39 -0400 Received: by mail-lj1-f175.google.com with SMTP id 17so26667392ljq.0 for <51541-done@debbugs.gnu.org>; Mon, 01 Nov 2021 07:48:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=C850dWKJpm2g97Kwvy8KWobegGMyQVuydUQdzioBR1w=; b=dVbX3Ybk0c7+rxyPgY66lkwvKaQQwWcZxu6SPR/QTWsjZZnVcKvx6I2MftBrpm6R1Q GR52GnxaCOmzd/COqzqL5G2YMb5Ezl/zwehTgW1dza269E5jA4V1EXZrWaf1NW/vozNk kNADnaDK2FkjIsLthOFPl7GjRSIt/yOqFUUoE8xI2EzavpdeUuyiYeZCo9Q/Kjbhm8LR o/2pf9VEpThR99ZpRak0cuwdOjeLUl6vuiIKrtiAIjdE0uvlwSmbyWs0LNxXYmzDzMeY bHWs6oCLmINx2hl77V2Vt9fGzaykkipkfCoFpKRKrKICx0teEO6NpmuGUsY8sBeHPAUA 7IbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=C850dWKJpm2g97Kwvy8KWobegGMyQVuydUQdzioBR1w=; b=D2+vmnxWBBaPbFoIO4AIxIiWXvXWC0rmTi1WrsW+cmgTDnsu8sKWOkncmrQhw/Ssvu rXeq+XUBoq45AS7HBIkXJhiJX0ekagyvklMpicagqg0Q5EcIhMyHvIeBoZ/tc/uR/1kW ZaH7qrXzWbPCcnrZZx2XkXvQXKW+zqJc1C7b3UiAvTLTA6hVVCGOoDoIBlkVGuqcC9RZ LXJE+pLHclPn/jzeUo2lARGQiir8Iwim5VbHt/nK6/it2/DWPnrpTWzD78+JAubgdwrG CzNKFKpbzP91qCyg6PLw2cl4N5WvNkg4PF8SrvU8c+6ZBmTDPJd7V0i8OkAyyn+7QBaF +Htw== X-Gm-Message-State: AOAM533eK2xg2BFg4BZQCI/kPcAi+vROuIKEp29Lh8J2kmGldqLsVqKm clAJoZV3FWRFhiETGkCDnQSweNZOd8Y= X-Google-Smtp-Source: ABdhPJwgMepIFB8ujAtpu6PEA3xuGdiCzAUUdL4WZylRP6f8qz/MvsVql2w0d0hSj/2fO7k3cwoUKQ== X-Received: by 2002:a05:651c:98c:: with SMTP id b12mr32029509ljq.481.1635778110854; Mon, 01 Nov 2021 07:48:30 -0700 (PDT) Received: from guixsd ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id m3sm582492lfg.165.2021.11.01.07.48.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 07:48:30 -0700 (PDT) From: Oleg Pykhalov To: Andrew Tropin Subject: Re: bug#51541: [PATCH] services: configuration: Fix interpose implementation. References: <875ytctiq2.fsf@trop.in> Date: Mon, 01 Nov 2021 17:48:26 +0300 In-Reply-To: <875ytctiq2.fsf@trop.in> (Andrew Tropin's message of "Mon, 1 Nov 2021 10:43:12 +0300") Message-ID: <874k8wkk3p.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51541-done Cc: 51541-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: -1.0 (-) --=-=-= Content-Type: text/plain Hi Andrew, Andrew Tropin writes: > * gnu/services/configuration.scm (interpose, serialize-text-config): Fix > interpose implementation, move file-like object code to > serialize-text-config. > --- > This gexp reading file-like object content doesn't belong to interpose > function, moved that part of code out of it. > > gnu/services/configuration.scm | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 deletions(-) Pushed to master. Thanks, Oleg. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJIBAEBCgAyFiEEcjhxI46s62NFSFhXFn+OpQAa+pwFAmF//joUHGdvLndpZ3Vz dEBnbWFpbC5jb20ACgkQFn+OpQAa+pxdRA//WJCf+vJyZnYLJBVbzo2JFkdAuLVY vtFbF9yB46SWv4Hs8t3CXhnsdtQFhDFTfCBVrgNw4PURDF1RNTyoEk3q5/QSn1rB GD9FsSicq4fMWTRMp0+v7H49fN6qH1miLoRnGI3QPF6Jr8XYgh50zYs4k3TX3S94 T5mbaIW4iqrzvG1F2ZQWwvEYbw38P91f4xdOzTH6TOjOFt/VAdaf9H0ym71FbPSB WjbRGsweQC+hIOAo25DH9G/oaMldvVJv3pM+5W9GMo/Ie1cwEQy4yUbbDjV/QOQr XqnMA8UfM+2oKuR/xuQGggsBplEE8p+m3A045MOEZd07tFUxum9uPzni80NWe0o9 KB8sSjAmCc+0M7b+2eiak//mw5LYERenK80dPzQ8xUjOS0AQYXE1v/AXDGGF3twV DSEY1wjVvZtoBBH+O3w3BCEhva1gOkXwgPwGebv/3Xou96n01anpS8QCw7uuW46q mP/cCGO0mLBZds1ZV7Hzia5hgZrhrNTvn7WBXfBQjp1FzVOQ+EoqtriIYOQVh/pp +5qapQNp4BUym2hPMHS0Pkpmaqpux9t8z9hwwjake5pCEMoAQ9hA/ujCm47RuoD3 1pGzDP8ItytPbBGuEkUoLTwxWcYmXPseyxDtlv2Zx7oLOgnW+ttZ4XZ9vthO2GST Qx/XQSurBYXmIzI= =qJfH -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 15 08:36:29 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 30 Nov 2021 12:24:05 +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