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 59B4E1389E2 for ; Thu, 4 Dec 2014 14:01:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC46FE0891; Thu, 4 Dec 2014 14:01: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 68E3CE0887 for ; Thu, 4 Dec 2014 14:01:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B087C34060F for ; Thu, 4 Dec 2014 14:01:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58F29B8EE for ; Thu, 4 Dec 2014 14:01:46 +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: <1417701694.859ce0c18b826cf3e89cab76661723ef7b11b420.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/isolated-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 859ce0c18b826cf3e89cab76661723ef7b11b420 X-VCS-Branch: master Date: Thu, 4 Dec 2014 14:01:46 +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: c3fef1a8-ba45-43f1-bf15-5a5dedc4b902 X-Archives-Hash: 9b0a3193d2ec866d40e2c0b8f6d94335 commit: 859ce0c18b826cf3e89cab76661723ef7b11b420 Author: Michał Górny gentoo org> AuthorDate: Mon Aug 18 08:39:29 2014 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Dec 4 14:01:34 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=859ce0c1 Apply 'nonfatal' to helpers only Make 'nonfatal' modifier affect helpers only rather than disabling 'die' completely. This improves the PMS conformance. --- bin/isolated-functions.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index ed96bd0..251d7ee 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -113,7 +113,7 @@ __bashpid() { } __helpers_die() { - if ___eapi_helpers_can_die; then + if ___eapi_helpers_can_die && [[ ${PORTAGE_NONFATAL} != 1 ]]; then die "$@" else echo -e "$@" >&2 @@ -123,11 +123,6 @@ __helpers_die() { die() { local IFS=$' \t\n' - if [[ $PORTAGE_NONFATAL -eq 1 ]]; then - echo -e " $WARN*$NORMAL ${FUNCNAME[1]}: WARNING: $@" >&2 - return 1 - fi - set +e if [ -n "${QA_INTERCEPTORS}" ] ; then # die was called from inside inherit. We need to clean up