~ruther/guix-local: guix: packages: Fix repacking of plain tarballs.

ac4417328d58f08105afd48545ba945b25f5e666 — Maxim Cournoyer 5 years ago 8a613f9

guix: packages: Fix repacking of plain tarballs.

Fixes <https://issues.guix.gnu.org/50066>.

* guix/packages.scm (patch-and-repack): Test for a tarball using tarball? and
move the plain file copy to the else clause.

Reported-by: Mathieu Othacehe <othacehe@gnu.org>

patch browse .tar.gz .zip

1 files changed, 4 insertions(+), 4 deletions(-)

M guix/packages.scm

M guix/packages.scm => guix/packages.scm +4 -4

@@ 981,10 981,10 @@ specifies modules in scope when evaluating SNIPPET."
                ((file-is-directory? #+source)
                 (copy-recursively directory #$output
                                   #:log (%make-void-port "w")))
-               ((not #+comp)
-                (copy-file file #$output))
-               (else
-                (repack directory #$output)))))))
+               ((or #+comp (tarball? #+source))
+                (repack directory #$output))
+               (else                    ;single uncompressed file
+                (copy-file file #$output)))))))
 
     (let ((name (if (or (checkout? original-file-name)
                         (not (compressor original-file-name)))