diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-10-19 18:20:47 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-10-19 18:28:57 +0200 |
| commit | fbdb7b9526272e1983bec1908d0704428af7c1f2 (patch) | |
| tree | aec1efaacd11f38df46da7162aab0300ee71a6a7 | |
| parent | 3bd45f5c809a56baafb355d93c1d2a243d6dd996 (diff) | |
| download | guix-fbdb7b9526272e1983bec1908d0704428af7c1f2.tar guix-fbdb7b9526272e1983bec1908d0704428af7c1f2.tar.gz | |
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.
| -rw-r--r-- | guix/scripts/pack.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index fb3c50521d..b7b4e22bbe 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 |