public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas K. Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/
Date: Sun,  3 Mar 2024 14:40:54 +0000 (UTC)	[thread overview]
Message-ID: <1709476818.6d67d9ebd6fe9d7ef6c962d27349d23631f5fb0b.dilfridge@gentoo> (raw)

commit:     6d67d9ebd6fe9d7ef6c962d27349d23631f5fb0b
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 14:40:18 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 14:40:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d67d9eb

profiles: 23.0: improve safety rail condition split vs merged

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/releases/23.0/profile.bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/releases/23.0/profile.bashrc b/profiles/releases/23.0/profile.bashrc
index 1a09f04d4d3a..6c178b086158 100644
--- a/profiles/releases/23.0/profile.bashrc
+++ b/profiles/releases/23.0/profile.bashrc
@@ -1,4 +1,4 @@
-if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ "${CATEGORY}/${PN}" != "sys-apps/baselayout" ]] ; then
+if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ -e "${EROOT%/}/bin" ]] ; then
 	if [[ ! -h "${EROOT%/}/bin" ]] && [[ "${PROFILE_23_USRTYPE}" != "split-usr" ]] ; then
 		eerror ""
 		eerror "Your profile is of type merged-usr, but your directories"


             reply	other threads:[~2024-03-03 14:40 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-03 14:40 Andreas K. Hüttel [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-04-09 22:34 [gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/ Sam James
2024-04-09 21:48 Andreas K. Hüttel
2024-03-23 19:27 Andreas K. Hüttel
2024-03-23 11:13 Ionen Wolkens
2024-03-07 21:15 Andreas K. Hüttel
2024-03-03 12:45 Andreas K. Hüttel
2024-02-29  8:54 Andreas K. Hüttel
2024-02-28 12:11 Ionen Wolkens
2023-12-18 13:56 Andreas K. Hüttel
2022-12-10 14:22 Andreas K. Hüttel
2022-12-05  0:30 Andreas K. Hüttel
2022-12-04 22:48 Andreas K. Hüttel
2022-12-04 22:21 Andreas K. Hüttel
2022-11-30  2:15 Sam James
2022-11-29  0:00 Andreas K. Hüttel
2022-11-22  0:02 Sam James
2022-11-13 18:27 Andreas K. Hüttel
2022-11-12 23:21 Andreas K. Hüttel
2022-11-12 23:05 Andreas K. Hüttel

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=1709476818.6d67d9ebd6fe9d7ef6c962d27349d23631f5fb0b.dilfridge@gentoo \
    --to=dilfridge@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.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