[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#31089] [PATCH 4/5] services: cgit: Enforce serialization order.
From: |
Clément Lassieur |
Subject: |
[bug#31089] [PATCH 4/5] services: cgit: Enforce serialization order. |
Date: |
Sat, 7 Apr 2018 19:07:08 +0200 |
This distinguishes fields whose order matters, and makes sure further changes
won't inadvertently change the 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.
---
gnu/services/cgit.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/services/cgit.scm b/gnu/services/cgit.scm
index 98e46e0b8..f53306cd3 100644
--- a/gnu/services/cgit.scm
+++ b/gnu/services/cgit.scm
@@ -631,6 +631,17 @@ for cgit to allow access to that repository.")
(list '())
"Extra options will be appended to cgitrc file."))
+(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
(cgit
(package cgit)
@@ -651,7 +662,7 @@ for cgit to allow access to that repository.")
(config-str
(if opaque-config?
(opaque-cgit-configuration-cgitrc config)
- (serialize-configuration config cgit-configuration-fields))))
+ (serialize-cgit-configuration config))))
#~(begin
(use-modules (guix build utils))
(mkdir-p #$(if opaque-config?
--
2.17.0