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 D99F058973 for ; Thu, 28 Jan 2016 12:10:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E0B021C027; Thu, 28 Jan 2016 12:10:30 +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 C920321C027 for ; Thu, 28 Jan 2016 12:10:29 +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 C10CE340813 for ; Thu, 28 Jan 2016 12:10:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8F7B28DA for ; Thu, 28 Jan 2016 12:10:26 +0000 (UTC) From: "Alexander Berntsen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexander Berntsen" Message-ID: <1453982916.f0ce7366b137119f087974d52ae807940e74ed56.bernalex@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: bernalex X-VCS-Committer-Name: Alexander Berntsen X-VCS-Revision: f0ce7366b137119f087974d52ae807940e74ed56 X-VCS-Branch: master Date: Thu, 28 Jan 2016 12:10:26 +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: 563d2f80-c2d5-4b04-8ce6-07a295a0b108 X-Archives-Hash: 6988abbfa68ceb5b8b6ebe6a8f7e70a0 commit: f0ce7366b137119f087974d52ae807940e74ed56 Author: Ulrich Müller gentoo org> AuthorDate: Wed Jan 27 21:05:51 2016 +0000 Commit: Alexander Berntsen gentoo org> CommitDate: Thu Jan 28 12:08:36 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f0ce7366 isolated-functions.sh: Output error message for nofatal die. X-Gentoo-Bug: 573056 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=573056 Signed-off-by: Alexander Berntsen gentoo.org> Acked-by: Alexander Berntsen gentoo.org> Acked-by: Brian Dolbec gentoo.org> bin/isolated-functions.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 5766921..e320f71 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 source "${PORTAGE_BIN_PATH}/eapi.sh" || exit 1 @@ -124,10 +124,11 @@ die() { set +x # tracing only produces useless noise here local IFS=$' \t\n' - if ___eapi_die_can_respect_nonfatal; then - if [[ ${1} == -n ]]; then - [[ ${PORTAGE_NONFATAL} == 1 ]] && return 1 - shift + if ___eapi_die_can_respect_nonfatal && [[ $1 == -n ]]; then + shift + if [[ ${PORTAGE_NONFATAL} == 1 ]]; then + [[ $# -gt 0 ]] && eerror "$*" + return 1 fi fi 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 6C4FE58973 for ; Fri, 29 Jan 2016 11:17:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C67EE0851; Fri, 29 Jan 2016 11:17:59 +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 AB68BE0851 for ; Fri, 29 Jan 2016 11:17:58 +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 D9815340C08 for ; Fri, 29 Jan 2016 11:17:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CBA3D8ED for ; Fri, 29 Jan 2016 11:17:52 +0000 (UTC) From: "Alexander Berntsen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexander Berntsen" Message-ID: <1453982916.f0ce7366b137119f087974d52ae807940e74ed56.bernalex@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: bernalex X-VCS-Committer-Name: Alexander Berntsen X-VCS-Revision: f0ce7366b137119f087974d52ae807940e74ed56 X-VCS-Branch: master Date: Fri, 29 Jan 2016 11:17:52 +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: 0a44b2c7-136c-4903-9bf1-733f7173635e X-Archives-Hash: 641c59655d7a6147c0a1c78832d2fd6e Message-ID: <20160129111752.MPCErC3UzeJSFNInLbBZ5Kq8bunmFfpWR54gCbcopnI@z> commit: f0ce7366b137119f087974d52ae807940e74ed56 Author: Ulrich Müller gentoo org> AuthorDate: Wed Jan 27 21:05:51 2016 +0000 Commit: Alexander Berntsen gentoo org> CommitDate: Thu Jan 28 12:08:36 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f0ce7366 isolated-functions.sh: Output error message for nofatal die. X-Gentoo-Bug: 573056 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=573056 Signed-off-by: Alexander Berntsen gentoo.org> Acked-by: Alexander Berntsen gentoo.org> Acked-by: Brian Dolbec gentoo.org> bin/isolated-functions.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 5766921..e320f71 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 source "${PORTAGE_BIN_PATH}/eapi.sh" || exit 1 @@ -124,10 +124,11 @@ die() { set +x # tracing only produces useless noise here local IFS=$' \t\n' - if ___eapi_die_can_respect_nonfatal; then - if [[ ${1} == -n ]]; then - [[ ${PORTAGE_NONFATAL} == 1 ]] && return 1 - shift + if ___eapi_die_can_respect_nonfatal && [[ $1 == -n ]]; then + shift + if [[ ${PORTAGE_NONFATAL} == 1 ]]; then + [[ $# -gt 0 ]] && eerror "$*" + return 1 fi fi