stdenv, dep-licenses.sh: do not skip handling of other exit traps

See https://github.com/akinomyoga/ble.sh/issues/179
This commit is contained in:
Sandro Jäckel 2022-02-20 16:27:24 +01:00
parent 1c772b4772
commit b7da6c7da7
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 3 additions and 3 deletions

View File

@ -9,7 +9,7 @@ tmp=$(mktemp --tmpdir -d nixpkgs-dep-license.XXXXXX)
exitHandler() {
exitCode=$?
rm -rf "$tmp"
exit $exitCode
return $exitCode
}
trap "exitHandler" EXIT

View File

@ -143,14 +143,14 @@ exitHandler() {
echo "build failed with exit code $exitCode (ignored)"
mkdir -p "$out/nix-support"
printf "%s" "$exitCode" > "$out/nix-support/failed"
exit 0
return 0
fi
else
runHook exitHook
fi
exit "$exitCode"
return "$exitCode"
}
trap "exitHandler" EXIT