From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [PATCH] union: Ensure that the output is always a directory Date: Fri, 04 Apr 2014 00:10:01 +0200 Message-ID: <87a9c2njye.fsf@gnu.org> References: <871txfk26u.fsf@yeeloong.lan> <87ha6anp8g.fsf@gnu.org> <87mwg2gjcs.fsf_-_@yeeloong.lan> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:47668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WVppq-0000kV-0D for guix-devel@gnu.org; Thu, 03 Apr 2014 18:10:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WVppk-0004dQ-1i for guix-devel@gnu.org; Thu, 03 Apr 2014 18:10:09 -0400 Received: from hera.aquilenet.fr ([2a01:474::1]:58515) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WVppj-0004cE-RS for guix-devel@gnu.org; Thu, 03 Apr 2014 18:10:03 -0400 In-Reply-To: <87mwg2gjcs.fsf_-_@yeeloong.lan> (Mark H. Weaver's message of "Thu, 03 Apr 2014 18:04:51 -0400") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Mark H Weaver Cc: guix-devel@gnu.org Mark H Weaver skribis: > From 6c8582bc41c8935b8e9d63146595e87d9b92fa95 Mon Sep 17 00:00:00 2001 > From: Mark H Weaver > Date: Thu, 3 Apr 2014 17:49:20 -0400 > Subject: [PATCH] union: Ensure that the output is always a directory. > MIME-Version: 1.0 > Content-Type: text/plain; charset=3DUTF-8 > Content-Transfer-Encoding: 8bit > > Fixes the creation of single-package profiles, reported by Ludovic Court= =C3=A8s. > > * guix/build/union.scm (union-build): Add new internal procedure > 'union-of-directories' that always creates a directory, containing the = code > previously used only to merge multiple directories. Call it from the > multiple-directory case in 'union' and from the top-level 'union-build'. Looks good to me. Can you run =E2=80=98make check TESTS=3Dtests/guix-package.sh=E2=80=99, and= push if it=E2=80=99s OK? (Actually that test was catching the problem.) Thanks for the quick fix! Ludo=E2=80=99.