From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 50358@debbugs.gnu.org
Cc: Mathieu Othacehe <othacehe@gnu.org>,
Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#50358] [PATCH core-updates-frozen 1/8] guix: packages: Fix repacking of plain tarballs.
Date: Fri, 3 Sep 2021 11:31:09 -0400 [thread overview]
Message-ID: <20210903153116.22517-1-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <20210903152903.22385-1-maxim.cournoyer@gmail.com>
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>
---
guix/packages.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index 2349bb4340..f0dd1d43d2 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -836,10 +836,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)))
--
2.33.0
next prev parent reply other threads:[~2021-09-03 15:33 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-03 15:29 [bug#50358] [PATCH core-updates-frozen 0/8] Shortened Rust bootstrap & other fixes Maxim Cournoyer
2021-09-03 15:31 ` Maxim Cournoyer [this message]
2021-09-03 15:31 ` [bug#50358] [PATCH core-updates-frozen 2/8] aux-files: sitecustomize: Cleanup and add explanatory comments Maxim Cournoyer
2021-09-03 15:31 ` [bug#50358] [PATCH core-updates-frozen 3/8] gnu: glade3: Remove sitecustomize.py workaround Maxim Cournoyer
2021-09-03 15:31 ` [bug#50358] [PATCH core-updates-frozen 4/8] gnu: rust: Bootstrap rust from 1.39.0 and optimize build time Maxim Cournoyer
2021-09-03 15:31 ` [bug#50358] [PATCH core-updates-frozen 5/8] gnu: rust: Add rust 1.54 and move all non-bootstrapping logic to it Maxim Cournoyer
2021-09-14 23:40 ` Thiago Jung Bauermann via Guix-patches via
2021-09-22 1:42 ` [bug#50358] [PATCH core-updates-frozen 0/8] Shortened Rust bootstrap & other fixes Maxim Cournoyer
2021-09-28 4:05 ` Thiago Jung Bauermann via Guix-patches via
2021-09-03 15:31 ` [bug#50358] [PATCH core-updates-frozen 6/8] gnu: Build all Rust packages using the latest rustc Maxim Cournoyer
2021-09-03 15:31 ` [bug#50358] [PATCH core-updates-frozen 7/8] gnu: mozjs-78: Update to 78.13.0 Maxim Cournoyer
2021-09-03 15:31 ` [bug#50358] [PATCH core-updates-frozen 8/8] gnu: fontconfig: Add a search path for XDG_DATA_DIRS Maxim Cournoyer
2021-09-08 16:35 ` [bug#50358] [PATCH core-updates-frozen 0/8] Shortened Rust bootstrap & other fixes Ludovic Courtès
2021-09-12 2:56 ` Maxim Cournoyer
2021-09-13 8:24 ` Ludovic Courtès
2021-09-15 4:32 ` Maxim Cournoyer
2021-09-16 19:56 ` Ludovic Courtès
2021-09-03 18:47 ` [bug#50358] [PATCH core-updates-frozen 1/8] guix: packages: Fix repacking of plain tarballs Mathieu Othacehe
2021-09-08 16:27 ` [bug#50358] [PATCH core-updates-frozen 0/8] Shortened Rust bootstrap & other fixes Ludovic Courtès
2021-09-12 2:49 ` Maxim Cournoyer
2021-10-15 5:48 ` John Kehayias via Guix-patches via
2021-11-12 5:57 ` bug#50358: " Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210903153116.22517-1-maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=50358@debbugs.gnu.org \
--cc=othacehe@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).