From: Arun Isaac <arunisaac@systemreboot.net>
To: 32102@debbugs.gnu.org
Subject: [bug#32102] [PATCH] utils: Fix wrap-program filename generation.
Date: Mon, 9 Jul 2018 07:01:03 +0530 [thread overview]
Message-ID: <20180709013103.26091-1-arunisaac@systemreboot.net> (raw)
* 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
next reply other threads:[~2018-07-09 1:32 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-09 1:31 Arun Isaac [this message]
2018-07-09 7:35 ` [bug#32102] [PATCH] utils: Fix wrap-program filename generation 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
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180709013103.26091-1-arunisaac@systemreboot.net \
--to=arunisaac@systemreboot.net \
--cc=32102@debbugs.gnu.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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).