pack: With ‘-R’, do not wrap directories.

Fixes a bug whereby ‘build-wrapper’ would end up being called on
directories (typically libexec/ sub-directories) simply because they match
‘executable-file?’.

* guix/scripts/pack.scm (wrapped-package)[build](executable?): New procedure.
Use it instead of ‘executable-file?’.

Reported-by: Tomas Volf <~@wolfsden.cz>
Fixes: https://issues.guix.gnu.org/81571
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Merges: #10609

1 files changed, 8 insertions, 1 deletions

diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 1536e913bf6..dbaff4a89c0 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -1348,6 +1348,13 @@ libfakechroot.so and related ld.so machinery as a fallback."
                              (elf-loader-compile-flags program)))
               (delete-file "run.c")))
 
+          (define (executable? file)
+            ;; Return #t if FILE is a regular file and is executable.
+            (let ((s (stat file #f)))
+              (and s
+                   (eq? 'regular (stat:type s))
+                   (not (zero? (logand (stat:mode s) #o100))))))
+
           (setvbuf (current-output-port) 'line)
 
           ;; Link the top-level files of PACKAGE so that search paths are
@@ -1360,7 +1367,7 @@ libfakechroot.so and related ld.so machinery as a fallback."
                     (scandir input))
 
           (receive (executables others)
-              (partition executable-file?
+              (partition executable?
                          ;; Note: Trailing slash in case these are symlinks.
                          (append (find-files (string-append input "/bin/"))
                                  (find-files (string-append input "/sbin/"))