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 D402E13946D for ; Tue, 3 Aug 2021 11:17:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CEB75E0B0C; Tue, 3 Aug 2021 11:17:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 A5604E0B09 for ; Tue, 3 Aug 2021 11:17:02 +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 B6F9D343C16 for ; Tue, 3 Aug 2021 11:17:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5110486E for ; Tue, 3 Aug 2021 11:16:59 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1627989234.61eee5f9f9b99a7161bdbb4a04c9f848c6767491.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/check-reqs.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 61eee5f9f9b99a7161bdbb4a04c9f848c6767491 X-VCS-Branch: master Date: Tue, 3 Aug 2021 11:16:59 +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: d686f566-a475-4101-9e8f-2bd5f9490c9d X-Archives-Hash: 3697d4fd102a29929ba66dd8d7ee066d commit: 61eee5f9f9b99a7161bdbb4a04c9f848c6767491 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jul 19 20:37:20 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Aug 3 11:13:54 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61eee5f9 check-reqs.eclass: Make check-reqs_memory internal Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/check-reqs.eclass | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index 1d5c044cb3b..0a3a8720bfe 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -139,7 +139,7 @@ _check-reqs_run() { if [[ ${MERGE_TYPE} != binary ]]; then [[ -n ${CHECKREQS_MEMORY} ]] && \ - check-reqs_memory \ + _check-reqs_memory \ ${CHECKREQS_MEMORY} [[ -n ${CHECKREQS_DISK_BUILD} ]] && \ @@ -294,6 +294,16 @@ _check-reqs_output() { # @DESCRIPTION: # Internal function that checks size of RAM. check-reqs_memory() { + [[ ${EAPI} == [67] ]] || + die "Internal function ${FUNCNAME} is not available in EAPI ${EAPI}." + _check-reqs_memory "$@" +} + +# @FUNCTION: _check-reqs_memory +# @INTERNAL +# @DESCRIPTION: +# Internal function that checks size of RAM. +_check-reqs_memory() { debug-print-function ${FUNCNAME} "$@" [[ -z ${1} ]] && die "Usage: ${FUNCNAME} [size]"