--- Begin Message ---
Subject: |
[PATCH] services: configuration: Fix interpose implementation. |
Date: |
Mon, 1 Nov 2021 10:43:12 +0300 |
* 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
Description: PGP signature
--- End Message ---
--- Begin Message ---
Subject: |
Re: bug#51541: [PATCH] services: configuration: Fix interpose implementation. |
Date: |
Mon, 01 Nov 2021 17:48:26 +0300 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) |
Hi Andrew,
Andrew Tropin <andrew@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
Description: PGP signature
--- End Message ---