summaryrefslogtreecommitdiff
path: root/gnu/build/linux-initrd.scm
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2019-07-16 18:09:38 +0900
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2019-09-25 12:18:25 +0900
commit91e633f0430c8c26e6915f79365a49d8a4327c96 (patch)
tree69e381c796e6b3a7c4a6c235d1c4de89f08ae6fa /gnu/build/linux-initrd.scm
parent4780db2c935110ea3254817ba0c519c229b9461e (diff)
downloadpatches-91e633f0430c8c26e6915f79365a49d8a4327c96.tar
patches-91e633f0430c8c26e6915f79365a49d8a4327c96.tar.gz
build: initrd: Fix "write-cpio-archive" return value.
* gnu/build/linux-initrd.scm (write-cpio-archive): Really return OUTPUT on success, even when compression is disabled.
Diffstat (limited to 'gnu/build/linux-initrd.scm')
-rw-r--r--gnu/build/linux-initrd.scm4
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)