bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: propagate E_REMOVE_BUILD_DEPS

Browse source 
remove_deps is called once, at the end of clean_up() before makepkg
exit. If remove_deps returns >0 (e.g. when pressing "n" in the resulting
prompt), the error is caught by the ERR signal handler. This in turns
sends SIGUSR1 to the process group, with resulting exit code 138.

In case remove_deps fails, this patch exits makepkg with E_REMOVE_DEPS
if there was no previous error (that is, EXIT_CODE equals E_OK).
Otherwise, makepkg exits with EXIT_CODE.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Alad Wenter 2019-01-20 23:14:14 +01:00 • committed by Allan McRae
parent 095d6332be
commit 7e79cf73fa
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/makepkg.sh.in
View file

@ -173,7 +173,11 @@ clean_up() {
fi
fi
remove_deps
if ! remove_deps && (( EXIT_CODE == E_OK )); then
exit $E_REMOVE_DEPS_FAILED
else
exit $EXIT_CODE
fi
}
enter_fakeroot() {