Re: [gentoo-portage-dev] [PATCH] Apply 'nonfatal' to helpers only
Dnia 2014-08-18, o godz. 08:07:12 Brian Dolbec napisał(a): > On Mon, 18 Aug 2014 14:04:32 +0200 > Michał Górny wrote: > > > Dnia 2014-08-18, o godz. 14:00:08 > > Arfrever Frehtes Taifersar Arahesis > > napisał(a): > > > > > 2014-08-18 11:02 Michał Górny napisał(a): > > > > Make 'nonfatal' modifier affect helpers only rather than > > > > disabling 'die' completely. This improves the PMS conformance. > > > > > > It is better to leave current code, until there is replacement > > > functionality. > > > > The replacement functionality is in EAPI 6. > > Then perhaps your commit message should have stated this is an EAPI 6 > involved change. Also, EAPI 6 is no where near started to be supported > in portage. So if this is an EAPI 6 change, it is the first. It's almost complete in my eapi6 branch -- first drafts for all the Council-approved features except runtime USE :). But this is more of preparation for it. Fixing a long-known bug in Portage. -- Best regards, Michał Górny signature.asc Description: PGP signature
Re: [gentoo-portage-dev] [PATCH] Apply 'nonfatal' to helpers only
On Mon, 18 Aug 2014 14:04:32 +0200 Michał Górny wrote: > Dnia 2014-08-18, o godz. 14:00:08 > Arfrever Frehtes Taifersar Arahesis > napisał(a): > > > 2014-08-18 11:02 Michał Górny napisał(a): > > > Make 'nonfatal' modifier affect helpers only rather than > > > disabling 'die' completely. This improves the PMS conformance. > > > > It is better to leave current code, until there is replacement > > functionality. > > The replacement functionality is in EAPI 6. > Then perhaps your commit message should have stated this is an EAPI 6 involved change. Also, EAPI 6 is no where near started to be supported in portage. So if this is an EAPI 6 change, it is the first. -- Brian Dolbec signature.asc Description: PGP signature
Re: [gentoo-portage-dev] [PATCH] Apply 'nonfatal' to helpers only
Dnia 2014-08-18, o godz. 14:00:08 Arfrever Frehtes Taifersar Arahesis napisał(a): > 2014-08-18 11:02 Michał Górny napisał(a): > > Make 'nonfatal' modifier affect helpers only rather than disabling 'die' > > completely. This improves the PMS conformance. > > It is better to leave current code, until there is replacement functionality. The replacement functionality is in EAPI 6. -- Best regards, Michał Górny signature.asc Description: PGP signature
Re: [gentoo-portage-dev] [PATCH] Apply 'nonfatal' to helpers only
2014-08-18 11:02 Michał Górny napisał(a): > Make 'nonfatal' modifier affect helpers only rather than disabling 'die' > completely. This improves the PMS conformance. It is better to leave current code, until there is replacement functionality. -- Arfrever Frehtes Taifersar Arahesis signature.asc Description: This is a digitally signed message part.
[gentoo-portage-dev] [PATCH] 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 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
