services: getmail: Use 'match-record'.
Fixes a regression introduced in
44554e7133
whereby the wrong record fields
would be accessed, leading to a <location> record being spliced in the
result.
* gnu/services/getmail.scm (serialize-getmail-configuration-file): Use
'match-record' instead of 'match'.
(getmail-shepherd-services): Likewise.
This commit is contained in:
parent
32c72dd99c
commit
83c9e00ffb
1 changed files with 31 additions and 33 deletions
|
@ -216,16 +216,15 @@ lines.")
|
||||||
"Extra options to include."))
|
"Extra options to include."))
|
||||||
|
|
||||||
(define (serialize-getmail-configuration-file field-name val)
|
(define (serialize-getmail-configuration-file field-name val)
|
||||||
(match val
|
(match-record val <getmail-configuration-file>
|
||||||
(($ <getmail-configuration-file> location
|
(retriever destination options)
|
||||||
retriever destination options)
|
|
||||||
#~(string-append
|
#~(string-append
|
||||||
"[retriever]\n"
|
"[retriever]\n"
|
||||||
#$(serialize-getmail-retriever-configuration #f retriever)
|
#$(serialize-getmail-retriever-configuration #f retriever)
|
||||||
"\n[destination]\n"
|
"\n[destination]\n"
|
||||||
#$(serialize-getmail-destination-configuration #f destination)
|
#$(serialize-getmail-destination-configuration #f destination)
|
||||||
"\n[options]\n"
|
"\n[options]\n"
|
||||||
#$(serialize-getmail-options-configuration #f options)))))
|
#$(serialize-getmail-options-configuration #f options))))
|
||||||
|
|
||||||
(define-configuration getmail-configuration-file
|
(define-configuration getmail-configuration-file
|
||||||
(retriever
|
(retriever
|
||||||
|
@ -339,10 +338,9 @@ notifications. This depends on the server supporting the IDLE extension.")
|
||||||
|
|
||||||
(define (getmail-shepherd-services configs)
|
(define (getmail-shepherd-services configs)
|
||||||
"Return a list of <shepherd-service> for CONFIGS."
|
"Return a list of <shepherd-service> for CONFIGS."
|
||||||
(map (match-lambda
|
(map (lambda (config)
|
||||||
(($ <getmail-configuration> location name package
|
(match-record config <getmail-configuration>
|
||||||
user group directory rcfile idle
|
(name package user group directory rcfile idle environment-variables)
|
||||||
environment-variables)
|
|
||||||
(shepherd-service
|
(shepherd-service
|
||||||
(documentation "Run getmail.")
|
(documentation "Run getmail.")
|
||||||
(provision (list (symbol-append 'getmail- name)))
|
(provision (list (symbol-append 'getmail- name)))
|
||||||
|
|
Reference in a new issue