01/01: pack: Fix handling of '-e'.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit d26727a143fab0dded1dbc848899270dbacd5dad
Author: Ludovic Courtès <address@hidden>
Date:   Mon May 7 14:04:19 2018 +0200

    pack: Fix handling of '-e'.
    
    Fixes a regression introduced in
    aad16cc1965ab3488449c262455eb29b15c77e95.
    Reported by Julien Lepiller.
    
    * guix/scripts/pack.scm (guix-pack)[manifest-from-args]: In
    'match-lambda', add clause for single packages.
    * tests/guix-pack.sh: Add test for '-e'.
---
 guix/scripts/pack.scm | 5 +++--
 tests/guix-pack.sh    | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 1f493d8..0e09a01 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -402,8 +402,9 @@ Create a bundle of PACKAGE.\n"))
     (let* ((transform     (options->transformation opts))
            (packages      (map (match-lambda
                                  (((? package? package) output)
-                                  (list (transform store package)
-                                        output)))
+                                  (list (transform store package) output))
+                                 ((? package? package)
+                                  (list (transform store package) "out")))
                                (filter-map maybe-package-argument opts)))
            (manifest-file (assoc-ref opts 'manifest)))
       (cond
diff --git a/tests/guix-pack.sh b/tests/guix-pack.sh
index ec56ac9..5584c10 100644
--- a/tests/guix-pack.sh
+++ b/tests/guix-pack.sh
@@ -35,8 +35,11 @@ export GUIX_BUILD_OPTIONS
 # Build a tarball with no compression.
 guix pack --compression=none --bootstrap guile-bootstrap
 
-# Build a tarball (with compression).
-guix pack --bootstrap guile-bootstrap
+# Build a tarball (with compression).  Check that '-e' works as well.
+out1="`guix pack --bootstrap guile-bootstrap`"
+out2="`guix pack --bootstrap -e '(@ (gnu packages bootstrap) 
%bootstrap-guile)'`"
+test -n "$out1"
+test "$out1" = "$out2"
 
 # Build a tarball with a symlink.
 the_pack="`guix pack --bootstrap -S /opt/gnu/bin=bin guile-bootstrap`"