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 F358C1580B3 for ; Fri, 3 Sep 2021 11:34:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48571E0841; Fri, 3 Sep 2021 11:34:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 2118AE07FE for ; Fri, 3 Sep 2021 11:34:18 +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 40845340E2A for ; Fri, 3 Sep 2021 11:34:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D03487E for ; Fri, 3 Sep 2021 11:34:15 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1630668730.c401d1781c5cc2945e8a7234716ad1c4f1b03ed3.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild.sh X-VCS-Directories: bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c401d1781c5cc2945e8a7234716ad1c4f1b03ed3 X-VCS-Branch: master Date: Fri, 3 Sep 2021 11:34:15 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: eb5b21e2-c53b-4ee4-aaad-0e0d48fb8d41 X-Archives-Hash: 80fba717d6eb84c4ffba122186b6cf63 commit: c401d1781c5cc2945e8a7234716ad1c4f1b03ed3 Author: Ulrich Müller gentoo org> AuthorDate: Mon Aug 30 06:22:10 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Sep 3 11:32:10 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c401d178 Revert "Revert "Generate a QA Notice when EXPORT_FUNCTIONS is called before inherit"" Reinstate the QA notice, because Portage behavior deviates from PMS, and breakage of eclasses with Pkgcore has been observed recently. This reverts commit f44d32550861cb25c209ef61dcd7ae1aa230da1f. Bug: https://bugs.gentoo.org/399039 Signed-off-by: Ulrich Müller gentoo.org> Signed-off-by: Michał Górny gentoo.org> bin/ebuild.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 5916bedfc..1bca2c965 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -243,6 +243,14 @@ inherit() { ECLASS_DEPTH=$(($ECLASS_DEPTH + 1)) if [[ ${ECLASS_DEPTH} -gt 1 ]]; then debug-print "*** Multiple Inheritence (Level: ${ECLASS_DEPTH})" + + # Since ECLASS_DEPTH > 1, the following variables are locals from the + # previous inherit call in the call stack. + if [[ -n ${ECLASS} && -n ${!__export_funcs_var} ]] ; then + eqawarn "QA Notice: EXPORT_FUNCTIONS is called before inherit in ${ECLASS}.eclass." + eqawarn "For compatibility with <=portage-2.1.6.7, only call EXPORT_FUNCTIONS" + eqawarn "after inherit(s)." + fi fi local -x ECLASS