From: Mike Gilbert <floppym@gentoo.org>
To: Gentoo Dev <gentoo-dev@lists.gentoo.org>
Cc: "Pacho Ramos" <pacho@gentoo.org>, "Ulrich Müller" <ulm@gentoo.org>
Subject: Re: [gentoo-dev] [PATCH] readme.gentoo-r1.eclass: Use fixed location for README.gentoo
Date: Mon, 16 Aug 2021 16:13:54 -0400 [thread overview]
Message-ID: <CAJ0EP423M9QxRyE-L6MCvmMjRvqdkkRyF8X=W99naG3-YFhVbg@mail.gmail.com> (raw)
In-Reply-To: <20210815105537.23292-1-ulm@gentoo.org>
On Sun, Aug 15, 2021 at 6:55 AM Ulrich Müller <ulm@gentoo.org> wrote:
>
> Eclass documentation and the elog message indicate that the expected
> location to install the file is /usr/share/doc/${PF}/README.gentoo,
> not the location of the ebuild's last docinto call.
>
> Signed-off-by: Ulrich Müller <ulm@gentoo.org>
> ---
> eclass/readme.gentoo-r1.eclass | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/eclass/readme.gentoo-r1.eclass b/eclass/readme.gentoo-r1.eclass
> index 69d0e1c5c6b4..bebdba5b705a 100644
> --- a/eclass/readme.gentoo-r1.eclass
> +++ b/eclass/readme.gentoo-r1.eclass
> @@ -76,7 +76,10 @@ readme.gentoo_create_doc() {
> die "You are not specifying README.gentoo contents!"
> fi
>
> - dodoc "${T}"/README.gentoo
> + ( # subshell to avoid pollution of calling environment
> + docinto .
> + dodoc "${T}"/README.gentoo
> + )
I believe the current handling "die" in subshells terminates execution
at the end of the current phase.
Maybe add "|| die" after the subshell so that execution stops
immediately if dodoc fails.
next prev parent reply other threads:[~2021-08-16 20:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-15 10:55 [gentoo-dev] [PATCH] readme.gentoo-r1.eclass: Use fixed location for README.gentoo Ulrich Müller
2021-08-16 20:13 ` Mike Gilbert [this message]
2021-08-17 4:53 ` Ulrich Mueller
2021-08-17 4:51 ` [gentoo-dev] [PATCH v2 1/2] " Ulrich Müller
2021-08-17 4:51 ` [gentoo-dev] [PATCH v2 2/2] readme.gentoo-r1.eclass: Standardize EAPI guard Ulrich Müller
2021-08-18 7:50 ` [gentoo-dev] " Pacho Ramos
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJ0EP423M9QxRyE-L6MCvmMjRvqdkkRyF8X=W99naG3-YFhVbg@mail.gmail.com' \
--to=floppym@gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
--cc=pacho@gentoo.org \
--cc=ulm@gentoo.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox