diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-10-10 17:32:24 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-10-10 17:32:24 +0200 |
| commit | 4d14902b9402a83db444d8d6818d0a4f438ce8c4 (patch) | |
| tree | 85f05a0540ebcd4a1f192096c36271a287eb9fe8 /gnu/build/linux-initrd.scm | |
| parent | 647cfcf68184e8558fcea751ef6d95b6e5d86ae1 (diff) | |
| parent | 6c50e1dc0625f89884cff40b22627091efa37708 (diff) | |
| download | guix-4d14902b9402a83db444d8d6818d0a4f438ce8c4.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/build/linux-initrd.scm')
| -rw-r--r-- | gnu/build/linux-initrd.scm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gnu/build/linux-initrd.scm b/gnu/build/linux-initrd.scm index 3aaa06d3a0..ea7de58553 100644 --- a/gnu/build/linux-initrd.scm +++ b/gnu/build/linux-initrd.scm @@ -71,8 +71,7 @@ COMPRESS? is true, compress it using GZIP. On success, return OUTPUT." (cpio:write-cpio-archive files port #:file->header cpio:file->cpio-header*))) - (or (not compress?) - + (if compress? ;; Gzip insists on adding a '.gz' suffix and does nothing if the input ;; file already has that suffix. Shuffle files around to placate it. (let* ((gz-suffix? (string-suffix? ".gz" output)) @@ -88,7 +87,6 @@ COMPRESS? is true, compress it using GZIP. On success, return OUTPUT." (unless gz-suffix? (rename-file (string-append output ".gz") output)) output))) - output)) (define (cache-compiled-file-name file) |