From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([209.51.188.92]:38525)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1h4vI7-0005xL-5G
	for guix-patches@gnu.org; Fri, 15 Mar 2019 18:27:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1h4vI6-00031U-9x
	for guix-patches@gnu.org; Fri, 15 Mar 2019 18:27:03 -0400
Received: from debbugs.gnu.org ([209.51.188.43]:60277)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1h4vI6-00031I-2E
	for guix-patches@gnu.org; Fri, 15 Mar 2019 18:27:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1h4vI5-00055q-Tk
	for guix-patches@gnu.org; Fri, 15 Mar 2019 18:27:01 -0400
Subject: bug#34626: pack: Construct inferior package names correctly.
Resent-To: guix-patches@gnu.org
Resent-Message-ID: <handler.34626.D34626.155268879219531.done@debbugs.gnu.org>
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
References: <f265653b-50de-49f5-9bbe-095a04b5c192@www.fastmail.com>
Date: Fri, 15 Mar 2019 23:26:13 +0100
In-Reply-To: <f265653b-50de-49f5-9bbe-095a04b5c192@www.fastmail.com> (Shyam's
	message of "Fri, 22 Feb 2019 23:11:50 -0500")
Message-ID: <87h8c322re.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Shyam <shyam@sykloid.org>
Cc: 34626-done@debbugs.gnu.org

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

Hello,

Shyam <shyam@sykloid.org> skribis:

> This patch fixes a bug where inferior packages' names were not being
> constructed correctly when calling `guix pack --relocatable`.

Good catch!

>>>From dd2171ce0d074cb6003afdaec353df572ed784a8 Mon Sep 17 00:00:00 2001
> From: "P.C. Shyamshankar" <shyam@sykloid.org>
> Date: Fri, 22 Feb 2019 22:38:47 -0500
> Subject: [PATCH] pack: Construct inferior package names correctly.
>
> * guix/scripts/pack.scm: 'wrapped-package' now correctly constructs full
>   names of inferior packages, allowing relocatable packs.

Applied with the minor change below.

Thank you, and sorry for the delay!

Ludo=E2=80=99.


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline

diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index e40c2085f7..17a166d9d7 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -28,7 +28,7 @@
   #:use-module (guix store)
   #:use-module ((guix status) #:select (with-status-verbosity))
   #:use-module (guix grafts)
-  #:use-module (guix inferior)
+  #:autoload   (guix inferior) (inferior-package?)
   #:use-module (guix monads)
   #:use-module (guix modules)
   #:use-module (guix packages)
@@ -593,7 +593,8 @@ please email '~a'~%")
                         ((inferior-package? package)
                          (string-append (inferior-package-name package)
                                         "-"
-                                        (inferior-package-version package))))
+                                        (inferior-package-version package)))
+                        (else "wrapper"))
                   "R")
                  build))
 

--=-=-=--