GNU bug report logs - #60582
[PATCH] Properly format list of packages & sync lightdm documentation.

Previous Next

Full log

Message #23 received at 60582 <at> debbugs.gnu.org (full text, mbox):

From: Bruno Victal <mirai <at> makinata.eu>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: 60582 <at> debbugs.gnu.org
Subject: Re: bug#60582: [PATCH] Properly format list of packages & sync
 lightdm documentation.
Date: Fri, 13 Jan 2023 20:34:15 +0000

On 2023-01-13 20:29, Maxim Cournoyer wrote:
> Hi,
> 
> Bruno Victal <mirai <at> makinata.eu> writes:
> 
>> * gnu/services/configuration.scm
>> (generate-documentation): Format a list of packages by their names.
>> ---
>>  gnu/services/configuration.scm | 3 +++
>>  1 file changed, 3 insertions(+)
>>
>> diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm
>> index 6b0291dc00..16e2380709 100644
>> --- a/gnu/services/configuration.scm
>> +++ b/gnu/services/configuration.scm
>> @@ -370,6 +370,9 @@ (define (show-default val)
>>                       (cond
>>                        ((package? val)
>>                         (symbol->string (package->symbol val)))
>> +                      ((and ((list-of package?) val) (not (null? val)))
>> +                       (format #f "(~{~a~^ ~})"
>> +                        (map package->symbol val)))
> 
> The 'and' and (not (null? val)) don't seem to be necessary as in the
> empty list of packages, it'd produce the same as the else clause below:
> 
> --8<---------------cut here---------------start------------->8---
> scheme@(gnu services configuration)> (format #f "(~{~a~^ ~})" '())
> $1 = "()"
> scheme@(gnu services configuration)> (str '())
> $2 = "()"
> --8<---------------cut here---------------end--------------->8---
> 
>>                        (else (str val))))
>>  
>>                     `(entry (% (heading
> 

It is necessary for non file-like fields whose default value is '().
Otherwise configuration->documentation will show blank spaces when it should show an empty list.


Cheers,
Bruno

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.