From: "Ludovic Courtès" <ludo@gnu.org>
To: Eric Bavier <bavier@posteo.net>
Cc: 39807@debbugs.gnu.org, Eric Bavier <bavier@member.fsf.org>
Subject: [bug#39807] [PATCH] guix: pack: Only wrap executable files.
Date: Tue, 24 Mar 2020 18:51:36 +0100 [thread overview]
Message-ID: <87h7ydljyv.fsf@gnu.org> (raw)
In-Reply-To: <87d09pohrj.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Fri, 06 Mar 2020 12:16:32 +0100")
Ping! :-)
Ludovic Courtès <ludo@gnu.org> skribis:
> Hi,
>
> Eric Bavier <bavier@posteo.net> skribis:
>
>> From: Eric Bavier <bavier@member.fsf.org>
>>
>> Hello Guix,
>>
>> This patch fixes some uses of relocatable git (e.g. octopus merge).
>> Previously, guix pack would wrap all files in "bin", "sbin", and "libexec",
>> even non-executable files. This would cause issues for git when its shell
>> scripts in libexec would try to source other shell files that had been
>> wrapped and were no longer a valid shell file.
>
> Good catch!
>
>> I feel like a test should be added to tests/guix-pack-relocatable.sh, but
>> I'm not sure how to do that while keeping the test lightweight. Suggestions
>> welcome.
>
> Not sure how to do that. Since ‘guix pack’ accepts manifests, you could
> have a manifest containing a ‘computed-file’ with a file that shouldn’t
> be wrapped, and then you could ensure that’s indeed the case. Or you
> could try with ‘git-minimal’ or some other package that exhibits the
> problem?
>
>> * guix/scripts/pack.scm (wrapped-package)<build>: Build wrappers for
>> executable files and symlink others.
>
> [...]
>
>> - (for-each build-wrapper
>> - (append (find-files (string-append input "/bin"))
>> - (find-files (string-append input "/sbin"))
>> - (find-files (string-append input "/libexec")))))))
>> + (receive (executables others)
>
> I’d prefer srfi-11 ‘let-values’. :-)
>
> Otherwise LGTM, thanks!
>
> Ludo’.
next prev parent reply other threads:[~2020-03-24 17:52 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-27 4:36 [bug#39807] [PATCH] guix: pack: Only wrap executable files Eric Bavier
2020-03-06 11:16 ` Ludovic Courtès
2020-03-24 17:51 ` Ludovic Courtès [this message]
2020-03-27 2:53 ` Eric Bavier
2020-03-27 2:29 ` Eric Bavier
[not found] ` <8d8a2e1209d82e136d36222683967956@posteo.net>
2020-03-29 14:39 ` Ludovic Courtès
2020-07-27 21:42 ` Eric Bavier
2020-10-21 5:09 ` Eric Bavier
2020-10-21 9:07 ` Ludovic Courtès
2020-10-21 15:12 ` Eric Bavier
2020-10-21 15:35 ` Ludovic Courtès
2020-10-21 16:21 ` Eric Bavier
2020-10-21 21:31 ` Ludovic Courtès
2020-10-21 23:51 ` Eric Bavier
2020-10-23 10:48 ` Ludovic Courtès
2020-10-30 15:13 ` bug#39807: " Eric Bavier
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=87h7ydljyv.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=39807@debbugs.gnu.org \
--cc=bavier@member.fsf.org \
--cc=bavier@posteo.net \
/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).