alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #161079 from SuperSandro2000/exit-handler

Browse source
This commit is contained in:
Sandro 2022-03-01 14:41:56 +01:00 committed by GitHub
parent fbd1c5b484 b7da6c7da7
commit 800e9e9994
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
maintainers/scripts/dep-licenses.sh
View file

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

4
pkgs/stdenv/generic/setup.sh
View file

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