diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-09-27 19:11:27 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-09-27 19:11:27 +0200 |
| commit | e7f62a41b245ca30404c54f3f77930336627c2f7 (patch) | |
| tree | 4b2a24dcc84f137b92ca581dba96cf7abac70439 /gnu/build/linux-initrd.scm | |
| parent | 1fdab9d3b3e78b0c90b52567be5535a861a7273d (diff) | |
| parent | b48eb1e934f1d457ff6a0fec1c572bb12ed15fab (diff) | |
| download | guix-patches-e7f62a41b245ca30404c54f3f77930336627c2f7.tar guix-patches-e7f62a41b245ca30404c54f3f77930336627c2f7.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) |