stdenv/multiple-outputs: Guard greps with 'set +/-o pipefail'
This is required since #7524 is fixed ("stdenv: Errors in hooks (such as postUnpack) get ignored")
This commit is contained in:
parent
2b67ba2ad2
commit
52c4337356
@ -138,9 +138,11 @@ _multioutPropagateDev() {
|
|||||||
# Default value: propagate binaries, includes and libraries
|
# Default value: propagate binaries, includes and libraries
|
||||||
if [[ ! -v "$propagatedOutputs" ]]; then
|
if [[ ! -v "$propagatedOutputs" ]]; then
|
||||||
local po_dirty="$outputBin $outputInclude $outputLib"
|
local po_dirty="$outputBin $outputInclude $outputLib"
|
||||||
|
set +o pipefail
|
||||||
propagatedOutputs=`echo "$po_dirty" \
|
propagatedOutputs=`echo "$po_dirty" \
|
||||||
| tr -s ' ' '\n' | grep -v -F "$outputFirst" \
|
| tr -s ' ' '\n' | grep -v -F "$outputFirst" \
|
||||||
| sort -u | tr '\n' ' ' `
|
| sort -u | tr '\n' ' ' `
|
||||||
|
set -o pipefail
|
||||||
|
|
||||||
elif [ -z "$propagatedOutputs" ]; then
|
elif [ -z "$propagatedOutputs" ]; then
|
||||||
return # variable was explicitly set to empty
|
return # variable was explicitly set to empty
|
||||||
|
Loading…
x
Reference in New Issue
Block a user