From patchwork Sat Feb 23 04:11:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shyam X-Patchwork-Id: 1223 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 820BF16C2C; Sat, 23 Feb 2019 07:21:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00, MIME_HEADER_CTYPE_ONLY,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 21FBA16AA7 for ; Sat, 23 Feb 2019 07:21:27 +0000 (GMT) Received: from localhost ([127.0.0.1]:33819 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxRck-0000Dh-F8 for patchwork@mira.cbaines.net; Sat, 23 Feb 2019 02:21:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxPnM-0006uE-Cm for guix-patches@gnu.org; Sat, 23 Feb 2019 00:24:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxPnJ-0005b3-Tx for guix-patches@gnu.org; Sat, 23 Feb 2019 00:24:16 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35199) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxPn8-0005Qr-Cv for guix-patches@gnu.org; Sat, 23 Feb 2019 00:24:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gxPn8-0003sq-5B for guix-patches@gnu.org; Sat, 23 Feb 2019 00:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34626] pack: Construct inferior package names correctly. Resent-From: Shyam Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Feb 2019 05:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34626 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 34626@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155089941914899 (code B ref -1); Sat, 23 Feb 2019 05:24:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Feb 2019 05:23:39 +0000 Received: from localhost ([127.0.0.1]:48743 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gxPml-0003sE-Ee for submit@debbugs.gnu.org; Sat, 23 Feb 2019 00:23:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gxOcj-00027v-JV for submit@debbugs.gnu.org; Fri, 22 Feb 2019 23:09:14 -0500 Received: from lists.gnu.org ([209.51.188.17]:47441) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gxOce-0008SZ-45 for submit@debbugs.gnu.org; Fri, 22 Feb 2019 23:09:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxOcd-0007dC-7p for guix-patches@gnu.org; Fri, 22 Feb 2019 23:09:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxOcc-0008Pj-Ah for guix-patches@gnu.org; Fri, 22 Feb 2019 23:09:07 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:35831) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gxOcb-000883-9A for guix-patches@gnu.org; Fri, 22 Feb 2019 23:09:06 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 9265D21AB8 for ; Fri, 22 Feb 2019 23:08:52 -0500 (EST) Received: from imap2 ([10.202.2.52]) by compute5.internal (MEProxy); Fri, 22 Feb 2019 23:08:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sykloid.org; h= message-id:date:from:to:subject:content-type; s=fm2; bh=8H1yfGd3 EoulWq9Lnq423De6UsqjnKbt+PdktwZZY/A=; b=kvRnbrU+yHgaEe/PiUBFEHNr 8ccLVWErqxCkW4ifX4QRA3+BPOwQ5dK3J3aWPbIZNH29TnWKJ+C5x1C8yeKSoFjl F0UixD0M5WzOPIdbBUFVFz1wMTLWvoLg861OIvVM/JBBAAV6KiYbMsUUpVw6pN+u BdSK6Qg3yg+Ydzb3CrnztfCKwGG+wwiHvsbGHtMiCA0GmitfpcJ92LT0cksYtJAe kX7R4cTqNfh/UCezTgL3B0NfQnwYcP+2d3prVzVnSTc+l2ZsJrc/0TU2YQyas9fc u+1wPf6c5Es1rodJ570gOB5ZVDMKtiWTfj6fOtnZMmFafmUtUKCoImSxTeoh8A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id:subject :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=8H1yfGd3EoulWq9Lnq423De6UsqjnKbt+PdktwZZY/A=; b=corYjZVK H/fh0JK4yJ4iVGX2yC3kWy3gd0Sk1l6fB/o5EKI/E8My5Vwt+pwP3urJJWqUgdZu OmWRBPB5yygA6rcV++va5gqVTkixB/jLNKBbQr661oeMYk5D8CEqYDpP+BOV4tOK 9A+B9zteEccY8pdlSNfWjUeP0m/B98UAIq5kXvPuIqN2+2eO81jFr6knEY/EGCir dKddbZrMSHM4oHqXSsx7IVrFgS5NXW+wcbgfsePBt4zvxUZFjfbdGwaSM37uPmh1 WZl/5LTPk2FrogspficqrvpdvAFBXR0GBhvZc6C6IACToEy1tK31mriqq5P+gM5V 9HyeHUFvlC68VQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddruddugdeiudculddtuddrgedtledrtddtmd cutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthen uceurghilhhouhhtmecufedttdenucenucfjughrpefofgfkfffhvffutgesmhdtreerre ertdenucfhrhhomhepufhhhigrmhcuoehshhihrghmsehshihklhhoihgurdhorhhgqeen ucfrrghrrghmpehmrghilhhfrhhomhepshhhhigrmhesshihkhhlohhiugdrohhrghenuc evlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 00CD17C1EB; Fri, 22 Feb 2019 23:08:51 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.1.5-895-g0d23ba6-fmstable-20190213v1 X-Me-Personality: 89874904 Message-Id: Date: Fri, 22 Feb 2019 23:11:50 -0500 From: Shyam X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Mailman-Approved-At: Sat, 23 Feb 2019 00:23:37 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-Mailman-Approved-At: Sat, 23 Feb 2019 02:21:22 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hello everyone, This patch fixes a bug where inferior packages' names were not being constructed correctly when calling `guix pack --relocatable`. Cheers, Shyam From dd2171ce0d074cb6003afdaec353df572ed784a8 Mon Sep 17 00:00:00 2001 From: "P.C. Shyamshankar" 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. --- guix/scripts/pack.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index b19a4ae1b..181a82696 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -28,6 +28,7 @@ #:use-module (guix store) #:use-module (guix status) #:use-module (guix grafts) + #:use-module (guix inferior) #:use-module (guix monads) #:use-module (guix modules) #:use-module (guix packages) @@ -570,7 +571,14 @@ please email '~a'~%") (find-files #$(file-append package "/sbin")) (find-files #$(file-append package "/libexec"))))))) - (computed-file (string-append (package-full-name package "-") "R") + (computed-file (string-append + (cond ((package? package) + (package-full-name package "-")) + ((inferior-package? package) + (string-append (inferior-package-name package) + "-" + (inferior-package-version package)))) + "R") build)) (define (map-manifest-entries proc manifest) -- 2.20.1