mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 15:43:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki 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
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() {
exitCode=$?
rm -rf "$tmp"
exit $exitCode
return $exitCode
}
trap "exitHandler" EXIT

4
pkgs/stdenv/generic/setup.sh
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