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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4D69115808B for ; Tue, 15 Feb 2022 21:30:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 670ECE07D9; Tue, 15 Feb 2022 21:30:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 51B96E07D9 for ; Tue, 15 Feb 2022 21:30:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5DF0A3432A7 for ; Tue, 15 Feb 2022 21:30:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B93F1F1 for ; Tue, 15 Feb 2022 21:30:54 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1644959876.f64ce32426f7be047dde583ada96f0cf3128a0a3.vapier@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: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: f64ce32426f7be047dde583ada96f0cf3128a0a3 X-VCS-Branch: master Date: Tue, 15 Feb 2022 21:30:54 +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: 49e0a3df-2e5e-4c1b-bb0b-cfe7cca29c95 X-Archives-Hash: 1b5acabf14599eebe1728be71038fc2e commit: f64ce32426f7be047dde583ada96f0cf3128a0a3 Author: Mike Frysinger chromium org> AuthorDate: Tue Feb 15 21:17:56 2022 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Feb 15 21:17:56 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f64ce324 ebuild: clarify EAPI bash requirements in error message When installing a package with an older bash than the ebuild's EAPI requires, the simple error message ">=bash-5.0 is required" is much too terse. Add details explaining why a newer version of bash is required. Signed-off-by: Mike Frysinger gentoo.org> bin/ebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index ba406034b..5b0b79585 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -32,7 +32,7 @@ __check_bash_version() { # Make sure the active bash is sane. if [[ ${BASH_VERSINFO[0]} -lt ${maj} ]] || [[ ${BASH_VERSINFO[0]} -eq ${maj} && ${BASH_VERSINFO[1]} -lt ${min} ]] ; then - die ">=bash-${maj}.${min} is required" + die "EAPI=\"${EAPI}\" requires >=bash-${maj}.${min}, but bash-${BASH_VERSION} found" fi # Set the compat level in case things change with newer ones. We must not