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)
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 3aaa06d3a0a..ea7de58553c 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."
71 (cpio:write-cpio-archive files port 71 (cpio:write-cpio-archive files port
72 #:file->header cpio:file->cpio-header*))) 72 #:file->header cpio:file->cpio-header*)))
73 73
74 (or (not compress?) 74 (if compress?
75
76 ;; Gzip insists on adding a '.gz' suffix and does nothing if the input 75 ;; Gzip insists on adding a '.gz' suffix and does nothing if the input
77 ;; file already has that suffix. Shuffle files around to placate it. 76 ;; file already has that suffix. Shuffle files around to placate it.
78 (let* ((gz-suffix? (string-suffix? ".gz" output)) 77 (let* ((gz-suffix? (string-suffix? ".gz" output))
@@ -88,7 +87,6 @@ COMPRESS? is true, compress it using GZIP. On success, return OUTPUT."
88 (unless gz-suffix? 87 (unless gz-suffix?
89 (rename-file (string-append output ".gz") output)) 88 (rename-file (string-append output ".gz") output))
90 output))) 89 output)))
91
92 output)) 90 output))
93 91
94(define (cache-compiled-file-name file) 92(define (cache-compiled-file-name file)