01/05: pack: Fix "-C none -f tarball".

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit fbdb7b9526272e1983bec1908d0704428af7c1f2
Author: Ludovic Courtès <address@hidden>
Date:   Fri Oct 19 18:20:47 2018 +0200

    pack: Fix "-C none -f tarball".
    
    Fixes a regression introduced in
    48b444304e206c35cf2c8e0d87a4711f1aac4fd4 whereby "guix pack -C none
    hello" would fail with:
    
      ERROR: In procedure string-join:
      In procedure string-join: Wrong type argument in position 1: #f
      builder for `/gnu/store/…-tarball-pack.tar.drv' failed with exit code 1
    
    * guix/scripts/pack.scm (self-contained-tarball): Adjust for when
    'compressor-command' returns #f.
---
 guix/scripts/pack.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index fb3c505..b7b4e22 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -198,8 +198,11 @@ added to the pack."
             (with-directory-excursion %root
               (exit
                (zero? (apply system* "tar"
-                             "-I"
-                             (string-join '#+(compressor-command compressor))
+                             #+@(if (compressor-command compressor)
+                                    #~("-I"
+                                       (string-join
+                                        '#+(compressor-command compressor)))
+                                    #~())
                              "--format=gnu"
 
                              ;; Avoid non-determinism in the archive.  Use