unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Mathieu Othacehe <othacehe@gnu.org>
Cc: 50066@debbugs.gnu.org
Subject: bug#50066: core-update: Raw origin tarballs are not handled correctly.
Date: Mon, 30 Aug 2021 23:50:20 -0400	[thread overview]
Message-ID: <874kb6jmrn.fsf@gmail.com> (raw)
In-Reply-To: <87lf4nsene.fsf@gmail.com> (Maxim Cournoyer's message of "Fri, 27 Aug 2021 00:19:33 -0400")

Hello Mathieu,

[...]

> Thanks for the report; it looks like a bug indeed.  I had probably
> overlooked that case (where there is no compression but we are still
> dealing with an archive format).  The annoying thing is that touching
> this code will trigger a world rebuild; so unless we find other big
> problems and batch the fixes, it may not be worth it.
>
> The site.py problem you reported may be one, if I find a solution.
>
> Other things on my mind:
>
> 1. rustc bootstrap from 1.39 (the itch to make it faster comes back
> everytime I have to build it ;-)).

I'm nearing completion on this front.

> 2. fontconfig update that should allow per-profile fonts management via
>   XDG_DATA_DIRS (I have the commit ready, but failed to test it due to
>   having to build rust and getting distracted by 1. :-))

I'll propose a few patches to include in the 'frozen' core-updates
branch since we've found a world-rebuilding change worthy of addressing
anyway (the patch below).

1 file changed, 4 insertions(+), 4 deletions(-)
guix/packages.scm | 8 ++++----

modified   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)))

Sadly the plain .tar file was/is not covered by tests (and not easily
so), but if his was my only omission, it should be correct (TM).
Attentive review needed :-).

Thank you!

Maxim




  reply	other threads:[~2021-08-31  3:51 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-15  8:42 bug#50066: core-update: Raw origin tarballs are not handled correctly Mathieu Othacehe
2021-08-27  4:19 ` Maxim Cournoyer
2021-08-31  3:50   ` Maxim Cournoyer [this message]
2021-09-01  7:09     ` Mathieu Othacehe
2021-09-01 12:57       ` Maxim Cournoyer
2021-09-03 13:30       ` Maxim Cournoyer
2021-12-19 16:40         ` Mathieu Othacehe

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=874kb6jmrn.fsf@gmail.com \
    --to=maxim.cournoyer@gmail.com \
    --cc=50066@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).