From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Subject: bug#23723: patch-shebang phase breaks symlinks Date: Sun, 12 Jun 2016 12:29:52 +0200 Message-ID: <8737oiog2n.fsf@gnu.org> References: <87fusowopk.fsf@fsfe.org> <87r3c51agw.fsf@gnu.org> <87r3c33l79.fsf@fsfe.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bC2fc-0008HA-E8 for bug-guix@gnu.org; Sun, 12 Jun 2016 06:31:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bC2fW-0005hZ-KI for bug-guix@gnu.org; Sun, 12 Jun 2016 06:31:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:53562) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bC2fW-0005hG-GT for bug-guix@gnu.org; Sun, 12 Jun 2016 06:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bC2fW-0004Rj-6p for bug-guix@gnu.org; Sun, 12 Jun 2016 06:31:02 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <87r3c33l79.fsf@fsfe.org> (Jelle Licht's message of "Sat, 11 Jun 2016 15:32:26 +0200") List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Jelle Licht Cc: 23723@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Jelle Licht skribis: > Ludovic Court=C3=A8s writes: >> Hello! >> >> Jelle Licht skribis: >> >>> It seems that the patch-shebang functionality does not deal gracefully >>> with symlinks: it just overwrites them! >>> >>> After struggling somewhat with getting the recently packaged node 6.0.0 >>> to behave, I found out that `patch-shebang' in (guix build >>> gnu-build-system) does not work properly on symlinks. >> >> There=E2=80=99s =E2=80=98patch-shebangs=E2=80=99 (plural) in this file, = but it explicitly >> touches only regular files (see =E2=80=98list-of-files=E2=80=99). >> > > It seems I made a mistake when writing the bug report; I am talking > about the `patch-shebang' defined in (guix build utils). My apologies. > > Also, seeing as my experience with the stat utility and similarly styled > programming libraries was lacking, I decided to play around with the > definition of `list-of-files': It actually does include symlinks, as > (stat:type (stat "some-symlinked-file")) gives us a plain old 'regular. > Looking into this a bit more, it seems that calling `stat' gives the > exact same results on both the linked-to-file and the symlink to that > file. > > For the particular problem I ran into to be fixed, it is imperative that > `list-of-files' of `patch-shebangs' includes the symlink; it does after > all need to be patched. The way this patching currently happens just > clobbers symlinks. My bad, indeed, =E2=80=98list-of-files=E2=80=99 should use =E2=80=98lstat= =E2=80=99 instead of =E2=80=98stat=E2=80=99. I think a patch like attached should solve the problem. WDYT? We can apply it to core-updates-next if that=E2=80=99s fine with you. Thanks, Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 2abaa6e..299eb5d 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -172,9 +172,8 @@ files such as `.in' templates. Most scripts honor $SHELL and $CONFIG_SHELL, but some don't, such as `mkinstalldirs' or Automake's `missing' script." (for-each patch-shebang - (remove (lambda (file) - (or (not (file-exists? file)) ;dangling symlink - (file-is-directory? file))) + (filter (lambda (file) + (eq? 'regular (lstat file))) (find-files ".")))) (define (patch-generated-file-shebangs . rest) @@ -303,7 +302,7 @@ makefiles." (define (list-of-files dir) (map (cut string-append dir "/" <>) (or (scandir dir (lambda (f) - (let ((s (stat (string-append dir "/" f)))) + (let ((s (lstat (string-append dir "/" f)))) (eq? 'regular (stat:type s))))) '()))) --=-=-=--