GNU bug report logs - #51541
[PATCH] services: configuration: Fix interpose implementation.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 51541 in the body.
You can then email your comments to 51541 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Andrew Tropin <andrew <at> trop.in>
To: guix-patches <at> gnu.org, Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: [PATCH] services: configuration: Fix interpose implementation.
Date: Mon, 1 Nov 2021 10:43:12 +0300

[Message part 1 (text/plain, inline)]

* 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(-)

diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm
index e8c55b6e4d..0de350a4df 100644
--- a/gnu/services/configuration.scm
+++ b/gnu/services/configuration.scm
@@ -359,10 +359,7 @@ (define* (interpose ls  #:optional (delimiter "\n") (grammar 'infix))
       (G_ "The GRAMMAR value must be 'infix or 'suffix, but ~a provided.")
       grammar)))
   (fold-right (lambda (e acc)
-                (cons #~(begin
-                          (use-modules (ice-9 rdelim))
-                          (with-fluids ((%default-port-encoding "UTF-8"))
-                            (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)
-  #~(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)))
 
 (define ((generic-serialize-alist-entry serialize-field) entry)
   "Apply the SERIALIZE-FIELD procedure on the field and value of ENTRY."
-- 
2.33.0

[signature.asc (application/pgp-signature, inline)]

Message #10 received at 51541-done <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: Andrew Tropin <andrew <at> trop.in>
Cc: 51541-done <at> debbugs.gnu.org
Subject: Re: bug#51541: [PATCH] services: configuration: Fix interpose
 implementation.
Date: Mon, 01 Nov 2021 17:48:26 +0300

[Message part 1 (text/plain, inline)]

Hi Andrew,

Andrew Tropin <andrew <at> trop.in> 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.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.