From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-portage-dev@lists.gentoo.org
Cc: "Michał Górny" <mgorny@gentoo.org>
Subject: [gentoo-portage-dev] [PATCH] Apply 'nonfatal' to helpers only
Date: Mon, 18 Aug 2014 11:02:56 +0200 [thread overview]
Message-ID: <1408352576-12776-1-git-send-email-mgorny@gentoo.org> (raw)
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 a22af57..d41f0b3 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -106,7 +106,7 @@ __bashpid() {
}
__helpers_die() {
- if ___eapi_helpers_can_die; then
+ if ___eapi_helpers_can_die && [[ ${PORTAGE_NONFATAL} != 1 ]]; then
die "$@"
else
echo -e "$@" >&2
@@ -116,11 +116,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
--
2.0.4
next reply other threads:[~2014-08-18 9:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-18 9:02 Michał Górny [this message]
2014-08-18 12:00 ` [gentoo-portage-dev] [PATCH] Apply 'nonfatal' to helpers only Arfrever Frehtes Taifersar Arahesis
2014-08-18 12:04 ` Michał Górny
2014-08-18 15:07 ` Brian Dolbec
2014-08-18 15:13 ` Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408352576-12776-1-git-send-email-mgorny@gentoo.org \
--to=mgorny@gentoo.org \
--cc=gentoo-portage-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox