[bug#34626] pack: Construct inferior package names correctly.

[bug#34626] pack: Construct inferior package names correctly.

[Shyam]

[-- Attachment #1: Type: text/plain, Size: 164 bytes --]

Hello everyone,

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

Cheers,

Shyam

[-- Attachment #2: 0001-pack-Construct-inferior-package-names-correctly.patch --]
[-- Type: text/x-patch, Size: 1596 bytes --]

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.
---
 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

bug#34626: pack: Construct inferior package names correctly.

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 669 bytes --]

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’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 936 bytes --]

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))