From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 210D61382C5 for ; Wed, 16 May 2018 19:24:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40FB3E089B; Wed, 16 May 2018 19:24:00 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C631E089B for ; Wed, 16 May 2018 19:24:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2D8D335C06 for ; Wed, 16 May 2018 19:23:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D59A043 for ; Wed, 16 May 2018 19:23:56 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1526498629.6574efff52ced6f4139d31e5e3fa494e3a31e119.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/amd64/17.1/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/default/linux/amd64/17.1/profile.bashrc X-VCS-Directories: profiles/default/linux/amd64/17.1/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 6574efff52ced6f4139d31e5e3fa494e3a31e119 X-VCS-Branch: master Date: Wed, 16 May 2018 19:23:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3528c5fd-14e5-4ed0-b6a1-64d47f142b52 X-Archives-Hash: 5e5decd81935ed581de63fbc11b6d8fe commit: 6574efff52ced6f4139d31e5e3fa494e3a31e119 Author: Brian Evans gentoo org> AuthorDate: Wed May 16 19:20:06 2018 +0000 Commit: Brian Evans gentoo org> CommitDate: Wed May 16 19:23:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6574efff profiles: amd64/17.1/profile.bashrc - Dereference symlink to /lib and /usr/lib Advanced users may want /lib and/or /usr/lib to point somewhere else This checks what should not be and warns but still lets those advanced people do what they like. profiles/default/linux/amd64/17.1/profile.bashrc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/profiles/default/linux/amd64/17.1/profile.bashrc b/profiles/default/linux/amd64/17.1/profile.bashrc index 44dc51c5540..7019782fb8f 100644 --- a/profiles/default/linux/amd64/17.1/profile.bashrc +++ b/profiles/default/linux/amd64/17.1/profile.bashrc @@ -1,7 +1,9 @@ -if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ -L ${ROOT%/}/lib || -L ${ROOT%/}/usr/lib ]] ; then - eerror "Please follow the instructions in the news item:" - eerror "2017-12-26-experimental-amd64-17-1-profiles" - eerror "or choose the 17.0 profile." - die "ERROR: 17.1 migration has not been performed!!" +if [[ "${EBUILD_PHASE}" == "setup" ]] ; then + if [[ "$(realpath ${ROOT%/}/lib)" == "${ROOT%/}/lib64" || "$(realpath ${ROOT%/}/usr/lib)" == "${ROOT%/}/usr/lib64" ]] ; then + eerror "Please follow the instructions in the news item:" + eerror "2017-12-26-experimental-amd64-17-1-profiles" + eerror "or choose the 17.0 profile." + die "ERROR: 17.1 migration has not been performed!!" + fi fi