aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tropin <andrew@trop.in>2021-11-01 10:43:12 +0300
committerOleg Pykhalov <go.wigust@gmail.com>2021-11-01 17:46:49 +0300
commit7af3b822178782d6598865e1d6a780a756dd0cb3 (patch)
tree049414ab0a9aa4cb9370debfad17947772dfec96
parent6e5ca0bb84b398d6cfad9025055a4f0b8d8e1e95 (diff)
downloadguix-7af3b822178782d6598865e1d6a780a756dd0cb3.tar.gz
guix-7af3b822178782d6598865e1d6a780a756dd0cb3.zip
services: configuration: Fix interpose implementation.
* gnu/services/configuration.scm (interpose, serialize-text-config): Fix interpose implementation, move file-like object code to serialize-text-config. Signed-off-by: Oleg Pykhalov <go.wigust@gmail.com>
-rw-r--r--gnu/services/configuration.scm16
1 files 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 @@ DELIMITER interposed LS. Support 'infix and 'suffix GRAMMAR values."
(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 @@ the list result in @code{#t} when applying PRED? on them."
(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."