From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdKmT-0006hy-Tu for guix-patches@gnu.org; Wed, 11 Jul 2018 15:28:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdKmR-0008Oz-HZ for guix-patches@gnu.org; Wed, 11 Jul 2018 15:28:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:48023) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdKmR-0008Ou-DO for guix-patches@gnu.org; Wed, 11 Jul 2018 15:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fdKmR-0008B9-6N for guix-patches@gnu.org; Wed, 11 Jul 2018 15:28:03 -0400 Subject: [bug#32102] [PATCH v2 1/2] build-system: python: Only wrap non-hidden executable files. Resent-Message-ID: From: Arun Isaac Date: Thu, 12 Jul 2018 00:56:51 +0530 Message-Id: <20180711192652.20186-2-arunisaac@systemreboot.net> In-Reply-To: <20180711192652.20186-1-arunisaac@systemreboot.net> References: <20180711192652.20186-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: clement@lassieur.org Cc: mhw@netris.org, 32102@debbugs.gnu.org * 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 ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2018 Arun Isaac ;;; ;;; 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