From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
Subject: Re: info dir clashes
Date: Mon, 06 Apr 2015 00:26:38 +0200
Message-ID: <87k2xq9ppd.fsf@gnu.org>
References: <CAKrPhPNS+wqELpaJTB02RiRFVomgyOZzVZFaCMQRZrhbL6=_Fg@mail.gmail.com>
	<87zj6x5gt5.fsf@gnu.org>
	<CAKrPhPOhAA2OguXhKTtn4L7j7c1aKBuYjPE1F7UObV4Zj6q6eQ@mail.gmail.com>
	<87lhi649bu.fsf@netris.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43647)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1Yet0D-0002q3-QE
	for guix-devel@gnu.org; Sun, 05 Apr 2015 18:26:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1Yet06-0000v7-KI
	for guix-devel@gnu.org; Sun, 05 Apr 2015 18:26:49 -0400
Received: from fencepost.gnu.org ([2001:4830:134:3::e]:57989)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ludo@gnu.org>)
	id 1Yet06-0000ux-HF
	for guix-devel@gnu.org; Sun, 05 Apr 2015 18:26:42 -0400
In-Reply-To: <87lhi649bu.fsf@netris.org> (Mark H. Weaver's message of "Sun, 05
	Apr 2015 16:19:17 -0400")
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: Federico Beffa <beffa@ieee.org>
Cc: Guix-devel <guix-devel@gnu.org>

Mark H Weaver <mhw@netris.org> skribis:

> Federico Beffa <beffa@ieee.org> writes:
>
>> From 06441ea6992808ef96139ab171269172dc65f2db Mon Sep 17 00:00:00 2001
>> From: Federico Beffa <beffa@fbengineering.ch>
>> Date: Sun, 5 Apr 2015 21:59:18 +0200
>> Subject: [PATCH] build-system/gnu: Add 'delete-info-dir-file' phase.
>>
>> * guix/build/gnu-build-system.scm (delete-info-dir-file): New procedure.
>>   (%standard-phases): Use it.
>> ---
>>  guix/build/gnu-build-system.scm | 10 ++++++++++
>>  1 file changed, 10 insertions(+)
>>
>> diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-syst=
em.scm
>> index 5220bda..284d1ee 100644
>> --- a/guix/build/gnu-build-system.scm
>> +++ b/guix/build/gnu-build-system.scm
>> @@ -538,6 +538,15 @@ DOCUMENTATION-COMPRESSOR-FLAGS."
>>          (format #t "not compressing documentation~%")
>>          #t)))
>>=20=20
>> +(define* (delete-info-dir-file #:key outputs #:allow-other-keys)
>> +  (every (match-lambda
>> +          ((output . directory)
>> +           (let ((info-dir-file (string-append directory "/share/info/d=
ir")))
>> +             (when (file-exists? info-dir-file)
>> +               (delete-file info-dir-file))
>> +             #t)))
>> +         outputs))
>
> In this case 'for-each' is the appropriate tool, since it ignores the
> results of the procedure calls, which are made only for their side
> effects.  So you can omit the #t.

Agreed.

Also add a docstring please.

> Otherwise, looks good to me for 'core-updates'.

One last thing:

>              patch-usr-bin-file
>              patch-source-shebangs configure patch-generated-file-shebangs
>              build check install
> +            delete-info-dir-file
>              patch-shebangs strip
>              validate-runpath
>              validate-documentation-location

The phase should go after =E2=80=98validate-documentation-location=E2=80=99=
, which is
makes sure things are in share/info/ rather than info/.

OK to push to =E2=80=98core-updates=E2=80=99 with these changes.

Thanks!

Ludo=E2=80=99.