Re: [gentoo-portage-dev] [PATCH] isolated-functions.sh: Output error message for nofatal die.
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 27/01/16 23:19, Brian Dolbec wrote: > looks good, you can push it I think can't you? I added acked-by and the bug URL to the commit message and pushed it as f0ce7366b137119f087974d52ae807940e74ed56. Thanks for the patch, Ulrich! - -- Alexander berna...@gentoo.org https://secure.plaimi.net/~alexander -BEGIN PGP SIGNATURE- Version: GnuPG v2 iQIcBAEBCgAGBQJWqgViAAoJENQqWdRUGk8BWDIP/RIEYeNDOSR7dJithc6s3N6K EVDdspg73adFbqxRnTg1l6eqGkcLGLVdNQSkxVMTkEenaA4nmj/FKW/1A8/pMx48 YC9aGQ6plPRFl3//mlq7pRwlea7tP0t/kCWJ6lWTJPLnXRX1qsxSK/IVUGdF3GLv djmhxcBQ9zttXLWoeAS91yZN6dHnMtwoigrNWMTSKPvVY3YSlCcbqCQDiWN99kC0 p1zapyzmETHW52qEuV9Twg1iuNAgHKhQi3TioKs4AP9+eAJ8U0eiS5+3c+u4FeWl alMxJX624u9TGVpPdC2tN/5CdKC2f3Eh69kKCcBe5KvSqkOElLIVqtUZjJxMVpqQ sRB9VcEw4hEI7a9fQ4qaKnt3k1VuoaX+4UgyAPqhB7JRH9Chf+RJkLhBNGtVuzoA kCVK4/XwJUXtc0TjwITVzhJk1vzKSb9BrKhtVeuCp6DxpJymVsbBb68Y3s8qw2MP VY/PXxpZWNHPH7FE2+sGp13cBOc3kEjexsizkk+QvX0+DWQldZuzyBykmgGcJ0dy VrckAhqii4BNcRlzzxDUj/UVsC2uj8utKSB2w64y1RpbZt6M1g7EbrDxxtW5VfGe XUl6VpENKNN1GdsMUFEks3hIwP096ICKkkHrPj41DJwdGeI0lzHIHZMBOz8WQiMI QQom1wzHOVCaeG0URSEl =Ypco -END PGP SIGNATURE-
Re: [gentoo-portage-dev] [PATCH] isolated-functions.sh: Output error message for nofatal die.
On Wed, 27 Jan 2016 22:05:51 +0100 Ulrich Müllerwrote: > X-Gentoo-Bug: 573056 > --- > 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 > looks good, you can push it I think can't you? -- Brian Dolbec