Re: [gentoo-portage-dev] [PATCH] XARGS: use gxargs for USERLAND=BSD (bug 663256)
On Thu, 9 Aug 2018 16:04:42 -0700 Zac Medico wrote: > For USERLAND=BSD, set XARGS="gxargs -r" if gxargs is available, > so the code from bug 630292 works for USERLAND=BSD. > > Fixes: 50283f1abb77 (install-qa-check.d/60pngfix: parallel support > (bug 630292)) Reported-by: Michał Górny > Bug: https://bugs.gentoo.org/663256 > --- > bin/isolated-functions.sh | 6 +- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh > index 28ca94532..cac42a4c5 100644 > --- a/bin/isolated-functions.sh > +++ b/bin/isolated-functions.sh > @@ -448,7 +448,11 @@ fi > if [[ -z ${XARGS} ]] ; then > case ${USERLAND} in > BSD) > - export XARGS="xargs" > + if type -P gxargs > /dev/null; then > + export XARGS="gxargs -r" > + else > + export XARGS="xargs" > + fi > ;; > *) > export XARGS="xargs -r" LGTM
Re: [gentoo-portage-dev] [PATCH] XARGS: use gxargs for USERLAND=BSD (bug 663256)
On 10/08/18 00:17, M. J. Everitt wrote: > On 10/08/18 00:04, Zac Medico wrote: >> For USERLAND=BSD, set XARGS="gxargs -r" if gxargs is available, >> so the code from bug 630292 works for USERLAND=BSD. >> >> Fixes: 50283f1abb77 (install-qa-check.d/60pngfix: parallel support (bug >> 630292)) >> Reported-by: Michał Górny >> Bug: https://bugs.gentoo.org/663256 >> --- >> bin/isolated-functions.sh | 6 +- >> 1 file changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh >> index 28ca94532..cac42a4c5 100644 >> --- a/bin/isolated-functions.sh >> +++ b/bin/isolated-functions.sh >> @@ -448,7 +448,11 @@ fi >> if [[ -z ${XARGS} ]] ; then >> case ${USERLAND} in >> BSD) >> -export XARGS="xargs" >> +if type -P gxargs > /dev/null; then >> +export XARGS="gxargs -r" >> +else >> +export XARGS="xargs" >> +fi >> ;; >> *) >> export XARGS="xargs -r" > Isn't the else clause there redundant? > Oops, sorry missed the minus before the first export .. my bad .. signature.asc Description: OpenPGP digital signature
Re: [gentoo-portage-dev] [PATCH] XARGS: use gxargs for USERLAND=BSD (bug 663256)
On 10/08/18 00:04, Zac Medico wrote: > For USERLAND=BSD, set XARGS="gxargs -r" if gxargs is available, > so the code from bug 630292 works for USERLAND=BSD. > > Fixes: 50283f1abb77 (install-qa-check.d/60pngfix: parallel support (bug > 630292)) > Reported-by: Michał Górny > Bug: https://bugs.gentoo.org/663256 > --- > bin/isolated-functions.sh | 6 +- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh > index 28ca94532..cac42a4c5 100644 > --- a/bin/isolated-functions.sh > +++ b/bin/isolated-functions.sh > @@ -448,7 +448,11 @@ fi > if [[ -z ${XARGS} ]] ; then > case ${USERLAND} in > BSD) > - export XARGS="xargs" > + if type -P gxargs > /dev/null; then > + export XARGS="gxargs -r" > + else > + export XARGS="xargs" > + fi > ;; > *) > export XARGS="xargs -r" Isn't the else clause there redundant? signature.asc Description: OpenPGP digital signature