[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/05: services: cgit: Enforce serialization order.
From: |
Clément Lassieur |
Subject: |
04/05: services: cgit: Enforce serialization order. |
Date: |
Wed, 11 Apr 2018 15:24:23 -0400 (EDT) |
snape pushed a commit to branch master
in repository guix.
commit 80b76b93506cadc967164cb07093f86bafb5aa77
Author: Clément Lassieur <address@hidden>
Date: Tue Mar 20 21:05:09 2018 +0100
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.
---
gnu/services/cgit.scm | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/gnu/services/cgit.scm b/gnu/services/cgit.scm
index 98e46e0..73d459c 100644
--- a/gnu/services/cgit.scm
+++ b/gnu/services/cgit.scm
@@ -631,6 +631,19 @@ for cgit to allow access to that repository.")
(list '())
"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
(cgit
(package cgit)
@@ -651,7 +664,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?