From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 518E41384B4 for ; Fri, 1 Jan 2016 16:46:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0EF121C0B8; Fri, 1 Jan 2016 16:41:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8E9B121C0AB for ; Fri, 1 Jan 2016 16:41:42 +0000 (UTC) Received: from localhost.localdomain (d202-251.icpnet.pl [109.173.202.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id B19A1340A3D; Fri, 1 Jan 2016 16:41:39 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 06/15] scons-utils.eclass: escons, respect nonfatal in EAPI 6 Date: Fri, 1 Jan 2016 17:41:12 +0100 Message-Id: <1451666481-22145-7-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1451666481-22145-1-git-send-email-mgorny@gentoo.org> References: <1451666481-22145-1-git-send-email-mgorny@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: bd9a2b4d-7afa-488c-9870-7a07b0e97d2e X-Archives-Hash: 8acdc3015dd5939524ca66498a47d8be --- eclass/scons-utils.eclass | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass index 4defbac..fe9160a0 100644 --- a/eclass/scons-utils.eclass +++ b/eclass/scons-utils.eclass @@ -107,7 +107,8 @@ fi # @DESCRIPTION: # Call scons, passing the supplied arguments, ${myesconsargs[@]}, # filtered ${MAKEOPTS}, ${EXTRA_ESCONS}. Similar to emake. Like emake, -# this function does die on failure in EAPI 4. +# this function does die on failure in EAPI 4. Respects nonfatal +# in EAPI 6 and newer. escons() { local ret @@ -121,7 +122,16 @@ escons() { ret=${?} if [[ ${ret} -ne 0 ]]; then - [[ ${EAPI:-0} != [0123] ]] && die "escons failed." + case "${EAPI:-0}" in + 0|1|2|3) # nonfatal in EAPIs 0 through 3 + ;; + 4|5) # 100% fatal in 4 & 5 + die "escons failed." + ;; + *) # respect nonfatal in 6 onwards + die -n "escons failed." + ;; + esac fi return ${ret} } -- 2.6.4