From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fCNtd-0000ia-Tr for guix-patches@gnu.org; Sat, 28 Apr 2018 07:20:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fCNta-0005tg-NP for guix-patches@gnu.org; Sat, 28 Apr 2018 07:20:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:33742) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fCNta-0005tY-Jc for guix-patches@gnu.org; Sat, 28 Apr 2018 07:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fCNta-0000H8-9m for guix-patches@gnu.org; Sat, 28 Apr 2018 07:20:02 -0400 Subject: [bug#31277] [PATCH 2/3] services: cgit: Improve handling of extra-options. Resent-Message-ID: References: <20180426212309.10809-1-mail@cbaines.net> <20180426212309.10809-2-mail@cbaines.net> From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur In-reply-to: <20180426212309.10809-2-mail@cbaines.net> Date: Sat, 28 Apr 2018 13:19:04 +0200 Message-ID: <87in8bino7.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Christopher Baines Cc: 31277@debbugs.gnu.org Christopher Baines writes: > * gnu/services/cgit.scm (serialize-cgit-configuration): Add the extra options, > one per line, before the scan-path, as this makes it possible to use the > extra-options to affect the global behaviour for repositories. > --- > gnu/services/cgit.scm | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/gnu/services/cgit.scm b/gnu/services/cgit.scm > index 8ef12cd5a..bacd6ca16 100644 > --- a/gnu/services/cgit.scm > +++ b/gnu/services/cgit.scm > @@ -642,13 +642,19 @@ for cgit to allow access to that repository.") > (not (memq (configuration-field-name field) > '(project-list > repository-directory > - repositories)))) > + repositories > + extra-options)))) ---^ Very small nitpick: could you put extra-options between project-list and repository-directory there? So that the order is the same with what comes below. > #~(string-append > #$(let ((rest (filter rest? cgit-configuration-fields))) > (serialize-configuration config rest)) > #$(serialize-project-list > 'project-list > (cgit-configuration-project-list config)) > + #$(string-join > + (append > + (cgit-configuration-extra-options config) > + '("")) > + "\n") Could you put the serialization code in a dedicated function? (e.g. SERIALIZE-EXTRA-OPTION) So that SERIALIZE-CGIT-CONFIGURATION is only responsible for the field ordering. Also, I don't understand why you append '(""). If it's just to make cgitrc look prettier, I'm not sure it's a good idea. But maybe I missed something? Otherwise LGTM :-) Clément