apteryx pushed a commit to branch core-updates-frozen
in repository guix.
commit ac4417328d58f08105afd48545ba945b25f5e666
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Mon Aug 30 17:32:21 2021 -0400
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 <[email protected]>
---
guix/packages.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index fb7eabd..083ee6d 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -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)))
