| 1 |
On 10/08/18 00:17, M. J. Everitt wrote: |
| 2 |
> On 10/08/18 00:04, Zac Medico wrote: |
| 3 |
>> For USERLAND=BSD, set XARGS="gxargs -r" if gxargs is available, |
| 4 |
>> so the code from bug 630292 works for USERLAND=BSD. |
| 5 |
>> |
| 6 |
>> Fixes: 50283f1abb77 (install-qa-check.d/60pngfix: parallel support (bug 630292)) |
| 7 |
>> Reported-by: Michał Górny <mgorny@g.o> |
| 8 |
>> Bug: https://bugs.gentoo.org/663256 |
| 9 |
>> --- |
| 10 |
>> bin/isolated-functions.sh | 6 +++++- |
| 11 |
>> 1 file changed, 5 insertions(+), 1 deletion(-) |
| 12 |
>> |
| 13 |
>> diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh |
| 14 |
>> index 28ca94532..cac42a4c5 100644 |
| 15 |
>> --- a/bin/isolated-functions.sh |
| 16 |
>> +++ b/bin/isolated-functions.sh |
| 17 |
>> @@ -448,7 +448,11 @@ fi |
| 18 |
>> if [[ -z ${XARGS} ]] ; then |
| 19 |
>> case ${USERLAND} in |
| 20 |
>> BSD) |
| 21 |
>> - export XARGS="xargs" |
| 22 |
>> + if type -P gxargs > /dev/null; then |
| 23 |
>> + export XARGS="gxargs -r" |
| 24 |
>> + else |
| 25 |
>> + export XARGS="xargs" |
| 26 |
>> + fi |
| 27 |
>> ;; |
| 28 |
>> *) |
| 29 |
>> export XARGS="xargs -r" |
| 30 |
> Isn't the else clause there redundant? |
| 31 |
> |
| 32 |
Oops, sorry missed the minus before the first export .. my bad .. </noise> |
Archives