From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=)
Subject: bug#19743: 'wrap-program' should preserve symbolic links
Date: Sun, 01 Feb 2015 22:41:57 +0100
Message-ID: <87386pe2ca.fsf@gnu.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Return-path: <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57803)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1YI3zo-0006ha-I8
	for bug-guix@gnu.org; Sun, 01 Feb 2015 18:32:05 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1YI3zn-0006Gt-Hm
	for bug-guix@gnu.org; Sun, 01 Feb 2015 18:32:04 -0500
Received: from debbugs.gnu.org ([140.186.70.43]:40418)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1YI3zn-0006Gp-ET
	for bug-guix@gnu.org; Sun, 01 Feb 2015 18:32:03 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1YI3zn-0001Oy-7g
	for bug-guix@gnu.org; Sun, 01 Feb 2015 18:32:03 -0500
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-Message-ID: <handler.19743.B.14228335205358@debbugs.gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57718)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1YI3zW-0006eK-6r
	for bug-guix@gnu.org; Sun, 01 Feb 2015 18:31:47 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1YI3zN-00069F-7N
	for bug-guix@gnu.org; Sun, 01 Feb 2015 18:31:46 -0500
Received: from fencepost.gnu.org ([2001:4830:134:3::e]:54024)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ludo@gnu.org>)
	id 1YI3zN-00069B-4e
	for bug-guix@gnu.org; Sun, 01 Feb 2015 18:31:37 -0500
Received: from reverse-83.fdn.fr ([80.67.176.83]:44744 helo=pluto)
	by fencepost.gnu.org with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <ludo@gnu.org>) id 1YI3zM-0000eR-MN
	for bug-guix@gnu.org; Sun, 01 Feb 2015 18:31:37 -0500
List-Id: Bug reports for GNU Guix <bug-guix.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-guix>,
	<mailto:bug-guix-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-guix>
List-Post: <mailto:bug-guix@gnu.org>
List-Help: <mailto:bug-guix-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-guix>,
	<mailto:bug-guix-request@gnu.org?subject=subscribe>
Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org
Sender: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org
To: 19743@debbugs.gnu.org

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

When =E2=80=98wrap-program=E2=80=99 is called on a symbolic link, it should=
 preserve its
symboliclinkness instead of copying it.

Ludo=E2=80=99.


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline

diff --git a/guix/build/utils.scm b/guix/build/utils.scm
index 4407f9a..56f682c 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -837,7 +837,7 @@ the previous wrapper."
     (if (zero? number)
         (let ((prog-real (string-append (dirname prog) "/."
                                         (basename prog) "-real")))
-          (copy-file prog prog-real)
+          (rename-file prog prog-real)
           prog-real)
         (wrapper-file-name number)))
 

--=-=-=--