bug#19743: 'wrap-program' should preserve symbolic links

bug#19743: 'wrap-program' should preserve symbolic links

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 133 bytes --]

When ‘wrap-program’ is called on a symbolic link, it should preserve its
symboliclinkness instead of copying it.

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 477 bytes --]

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)))
 

bug#19743: Close

[Andreas Enge]

Applied in commit da466f7ff63e34aca271e603090f25ba471f009e.

Andreas

bug#19743: 'wrap-program' should preserve symbolic links

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> From cced64ffd33754434d732c552bdbb5c038891a8d Mon Sep 17 00:00:00 2001
> From: Andreas Enge <andreas@enge.fr>
> Date: Sun, 15 Feb 2015 17:40:17 +0100
> Subject: [PATCH] utils: Preserve symbolic links in 'wrap-program'.
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> * guix/build/utils.scm (wrap-program): Preserve symbolic links instead of
>     copying the contents of the link.
    ^^
No extra space here please.

> Co-authored-by: Ludovic Courtès <ludo@gnu.org>
>
> Closes <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19743>.

Use “Fixes: ...” as in the other commits.

OK for ‘core-updates’.

Thank you!

Ludo’.