all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Arun Isaac <arunisaac@systemreboot.net>
To: clement@lassieur.org
Cc: mhw@netris.org, 32102@debbugs.gnu.org
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	[thread overview]
Message-ID: <20180711192652.20186-2-arunisaac@systemreboot.net> (raw)
In-Reply-To: <20180711192652.20186-1-arunisaac@systemreboot.net>

* 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@netris.org>
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2018 Arun Isaac <arunisaac@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

  reply	other threads:[~2018-07-11 19:28 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-09  1:31 [bug#32102] [PATCH] utils: Fix wrap-program filename generation Arun Isaac
2018-07-09  7:35 ` Clément Lassieur
2018-07-09 10:49   ` Arun Isaac
2018-07-09 14:12     ` Clément Lassieur
2018-07-10  5:16       ` Arun Isaac
2018-07-10  8:57         ` Clément Lassieur
2018-07-10 18:13           ` Mark H Weaver
2018-07-11 19:26 ` [bug#32102] [PATCH v2 0/2] build-system: python: Only wrap non-hidden executable files Arun Isaac
2018-07-11 19:26   ` Arun Isaac [this message]
2018-07-13  7:42     ` [bug#32102] [PATCH v2 1/2] " Clément Lassieur
2018-07-13  8:35       ` Arun Isaac
2018-07-11 19:26   ` [bug#32102] [PATCH v2 2/2] gnu: gajim: Combine wrap-program phases Arun Isaac
2018-07-13  8:38     ` Clément Lassieur
2018-07-13  9:45       ` Arun Isaac
2018-07-28 20:42         ` Arun Isaac
2018-07-29 14:20           ` Ludovic Courtès
2018-07-30  0:30             ` Arun Isaac
2018-08-27 11:37               ` Ludovic Courtès
2018-08-28  8:37                 ` Arun Isaac
2018-08-29 20:42                   ` Ludovic Courtès
2018-11-22 16:54                     ` Arun Isaac
2018-11-23  9:09                       ` Ludovic Courtès
2018-11-27 10:43                         ` bug#32102: " Arun Isaac
2018-11-27 12:24                           ` [bug#32102] " Clément Lassieur

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180711192652.20186-2-arunisaac@systemreboot.net \
    --to=arunisaac@systemreboot.net \
    --cc=32102@debbugs.gnu.org \
    --cc=clement@lassieur.org \
    --cc=mhw@netris.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.