guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: build: initrd: Fix "write-cpio-archive" return value.


From: guix-commits
Subject: 01/02: build: initrd: Fix "write-cpio-archive" return value.
Date: Tue, 24 Sep 2019 23:18:41 -0400 (EDT)

apteryx pushed a commit to branch master
in repository guix.

commit 91e633f0430c8c26e6915f79365a49d8a4327c96
Author: Maxim Cournoyer <address@hidden>
Date:   Tue Jul 16 18:09:38 2019 +0900

    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.
---
 gnu/build/linux-initrd.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/build/linux-initrd.scm b/gnu/build/linux-initrd.scm
index 3aaa06d..ea7de58 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]