all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#32102] [PATCH] utils: Fix wrap-program filename generation.
@ 2018-07-09  1:31 Arun Isaac
  2018-07-09  7:35 ` Clément Lassieur
  2018-07-11 19:26 ` [bug#32102] [PATCH v2 0/2] build-system: python: Only wrap non-hidden executable files Arun Isaac
  0 siblings, 2 replies; 24+ messages in thread
From: Arun Isaac @ 2018-07-09  1:31 UTC (permalink / raw)
  To: 32102

* guix/build/utils.scm (wrap-program): While generating a new filename for the
wrapped program, trim dots from the left of the basename. This prevents
already wrapped files being wrapped again with two or more dots prepended to
them.
---
 guix/build/utils.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/guix/build/utils.scm b/guix/build/utils.scm
index c58a1afd1..0794c658f 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1032,7 +1033,8 @@ modules in $GUILE_LOAD_PATH, etc.
 If PROG has previously been wrapped by 'wrap-program', the wrapper is extended
 with definitions for VARS."
   (define wrapped-file
-    (string-append (dirname prog) "/." (basename prog) "-real"))
+    (string-append
+     (dirname prog) "/." (string-trim (basename prog) #\.) "-real"))
 
   (define already-wrapped?
     (file-exists? wrapped-file))
-- 
2.15.1

^ permalink raw reply related	[flat|nested] 24+ messages in thread

end of thread, other threads:[~2018-11-27 12:25 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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   ` [bug#32102] [PATCH v2 1/2] " Arun Isaac
2018-07-13  7:42     ` 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

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.