nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: cgit: Enforce serialization order. 

* gnu/services/cgit.scm (serialize-cgit-configuration): New procedure that
serializes fields with a precise order.
(cgit-activation): Replace the generic SERIALIZE-CONFIGURATION with
SERIALIZE-CGIT-CONFIGURATION.
This commit is contained in:
Clément Lassieur 2018-03-20 21:05:09 +01:00
parent ad05e96e14
commit 80b76b9350
No known key found for this signature in database
GPG Key ID: 89F96D4808F359C7
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/services/cgit.scm
View File

@ -631,6 +631,19 @@ for cgit to allow access to that repository.")
(list '()) (list '())
"Extra options will be appended to cgitrc file.")) "Extra options will be appended to cgitrc file."))
;; This distinguishes fields whose order matters, and makes sure further
;; changes won't inadvertently change the order.
(define (serialize-cgit-configuration config)
(define (rest? field)
(not (memq (configuration-field-name field)
'(repositories))))
#~(string-append
#$(let ((rest (filter rest? cgit-configuration-fields)))
(serialize-configuration config rest))
#$(serialize-repository-cgit-configuration-list
'repositories
(cgit-configuration-repositories config))))
(define-configuration opaque-cgit-configuration (define-configuration opaque-cgit-configuration
(cgit (cgit
(package cgit) (package cgit)
@ -651,7 +664,7 @@ for cgit to allow access to that repository.")
(config-str (config-str
(if opaque-config? (if opaque-config?
(opaque-cgit-configuration-cgitrc config) (opaque-cgit-configuration-cgitrc config)
(serialize-configuration config cgit-configuration-fields)))) (serialize-cgit-configuration config))))
#~(begin #~(begin
(use-modules (guix build utils)) (use-modules (guix build utils))
(mkdir-p #$(if opaque-config? (mkdir-p #$(if opaque-config?