Subject: bug#32102: closed (Re: [bug#32102] [PATCH v2 2/2] gnu: gajim: Combine wrap-program phases.)

From: [email-masked] (GNU bug Tracking System)
Date: Tue, 27 Nov 2018 10:45:02 +0000

Your bug report

#32102: [PATCH] utils: Fix wrap-program filename generation.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
32102: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=32102
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#32102] [PATCH v2 2/2] gnu: gajim: Combine wrap-program phases.
From: Arun Isaac <[email-masked]>
To: Ludovic Courtès <[email-masked]>
Cc: Clément Lassieur <[email-masked]>, [email-masked]
Date: Tue, 27 Nov 2018 16:13:51 +0530
List-Id: <debbugs-submit.debbugs.gnu.org>

I pushed "PATCH 1: Do not double wrap executables" to core-updates-next
after making the changes you suggested.

I pushed "PATCH 2: Rename wrap-program phases" to master since it
only causes a rebuild of gajim.

"PATCH 3: Return #t from wrap-gsettings-schema-dir phase" is now
irrelevant due to commit 60c5b4448961ce1745b7f0bfada1e7620f238ea0 by
Clement on master.

Subject: [PATCH] utils: Fix wrap-program filename generation.
From: Arun Isaac <[email-masked]>
To: [email-masked]
Cc: Arun Isaac <[email-masked]>
Date: Mon, 9 Jul 2018 07:01:03 +0530
List-Id: <debbugs-submit.debbugs.gnu.org>

* 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 <[email-masked]>
 ;;; Copyright © 2013 Nikita Karetnikov <[email-masked]>
 ;;; Copyright © 2015, 2018 Mark H Weaver <[email-masked]>
+;;; Copyright © 2018 Arun Isaac <[email-masked]>
 ;;;
 ;;; 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