From: "Clément Lassieur" <clement@lassieur.org>
To: 31089@debbugs.gnu.org
Subject: [bug#31089] [PATCH 4/5] services: cgit: Enforce serialization order.
Date: Sat, 7 Apr 2018 19:07:08 +0200 [thread overview]
Message-ID: <20180407170709.22160-4-clement@lassieur.org> (raw)
In-Reply-To: <20180407170709.22160-1-clement@lassieur.org>
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
next prev parent reply other threads:[~2018-04-07 17:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-07 17:04 [bug#31089] cgit service: add support for file-like objects Clément Lassieur
2018-04-07 17:07 ` [bug#31089] [PATCH 1/5] services: cgit: Simplify 'uglify-field-name' Clément Lassieur
2018-04-07 17:07 ` [bug#31089] [PATCH 2/5] services: cgit: Simplify 'serialize-module-link-path' Clément Lassieur
2018-04-10 20:56 ` Ludovic Courtès
2018-04-07 17:07 ` [bug#31089] [PATCH 3/5] services: cgit: Add support for file-like objects Clément Lassieur
2018-04-09 7:19 ` Clément Lassieur
2018-04-10 20:59 ` Ludovic Courtès
2018-04-11 8:35 ` Clément Lassieur
2018-04-11 19:27 ` bug#31089: " Clément Lassieur
2018-04-07 17:07 ` Clément Lassieur [this message]
2018-04-10 21:00 ` [bug#31089] [PATCH 4/5] services: cgit: Enforce serialization order Ludovic Courtès
2018-04-07 17:07 ` [bug#31089] [PATCH 5/5] services: cgit: Add support for project-list Clément Lassieur
2018-04-10 21:00 ` Ludovic Courtès
2018-04-10 20:56 ` [bug#31089] [PATCH 1/5] services: cgit: Simplify 'uglify-field-name' Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180407170709.22160-4-clement@lassieur.org \
--to=clement@lassieur.org \
--cc=31089@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).