GNU bug report logs - #32102
[PATCH] utils: Fix wrap-program filename generation.

Previous Next

Full log

View this message in rfc822 format

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: clement <at> lassieur.org
Cc: mhw <at> netris.org, Arun Isaac <arunisaac <at> systemreboot.net>, 32102 <at> debbugs.gnu.org, andreas <at> enge.fr
Subject: [bug#32102] [PATCH v2 1/2] build-system: python: Only wrap non-hidden executable files.
Date: Thu, 12 Jul 2018 00:56:51 +0530

* guix/build/python-build-system.scm (wrap): Only wrap non-hidden executable
files. This prevents wrapped executables from being wrapped once again.
---
 guix/build/python-build-system.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm
index 376ea81f1..37e35eec0 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2015, 2018 Mark H Weaver <mhw <at> netris.org>
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
 ;;; Copyright © 2018 Ricardo Wurmus <rekado <at> elephly.net>
+;;; Copyright © 2018 Arun Isaac <arunisaac <at> systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -189,7 +190,11 @@ when running checks after installing the package."
     (map (cut string-append dir "/" <>)
          (or (scandir dir (lambda (f)
                             (let ((s (stat (string-append dir "/" f))))
-                              (eq? 'regular (stat:type s)))))
+                              (and (eq? 'regular (stat:type s))
+                                   ;; Only wrap non-hidden files. This
+                                   ;; prevents wrapped executables from being
+                                   ;; wrapped again.
+                                   (not (string-prefix? "." f))))))
              '())))
 
   (define bindirs
-- 
2.15.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.