| Message ID | 20190625115853.27832-1-allan@archlinux.org |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [pacman-dev] makepkg: do not exit immediately on dependency install failures | expand |
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 On Tue, 25 Jun 2019, Allan McRae wrote: > Fixes FS#63000 > > Signed-off-by: Allan McRae <allan@archlinux.org> > --- > scripts/makepkg.sh.in | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in > index aa03e9d9..43484db3 100644 > --- a/scripts/makepkg.sh.in > +++ b/scripts/makepkg.sh.in > @@ -273,7 +273,7 @@ handle_deps() { > > if ! run_pacman -S --asdeps "${deplist[@]}"; then > error "$(gettext "'%s' failed to install missing dependencies.")" "$PACMAN" > - exit $E_INSTALL_DEPS_FAILED > + return $R_DEPS_MISSING > fi > fi > > @@ -303,7 +303,7 @@ resolve_deps() { > > if handle_deps "${deplist[@]}"; then > # check deps again to make sure they were resolved > - deplist=$(check_deps "$@") || exit $E_INSTALL_DEPS_FAILED > + deplist=$(check_deps "$@") > [[ -z $deplist ]] && return $R_DEPS_SATISFIED > fi > > -- > 2.22.0 > yes, this works for me, too - and looks much nicer than my version :-) cheers, Erich -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE3p92iMrPBP64GmxZCu7JB1Xae1oFAl0SDnYACgkQCu7JB1Xa e1rCdA/+KRqEm/UwO5C/DZZrogsY1AJ9fEaUwV6wbeHANKtFlM1niGuZfJbzdwxO tsA6cwx7OxWN0BlvtNkvWFmmOx42afGOQ+FhBlls6lfcGFx0WdYE8xEOMFwzmJSd qnHC/OqEmEvaugJYg81r7lg6zNMhGM8kBbdvPOKvFm6odlFfYGv2qlEGGfSVfKkH oIM1IP46hQLU/t5XTaKwS3KHgI6W5SnwdiZ4lhzz1pyfbXtvV5moweQq4rrbm+vR 2QQMSdwwxuo4f7WIL69lVOVIAEgoSX26ZU5QTajlt3HmN1h0KZ8pBsLgVrOq8fd/ ZkFk8tVQlZx22oUvDiYw+3ts17iVuu8FZ67BaeMLbYhuavlci3ExsYC6PFEkte4K sidYEodaDg0TUmmPwtwR264veM9niZMQq7XL/atGRlt5F7lK0rtzfPagZNSOKMHD SR7KPM3L1ZEvuVphIqoBEiEJdD9rFCtE3T3qxJN7hCLFJugwQ7I/5Q1kF44HmgQD DBwEEtwhO2pjwZTMAN7P/qTpCX+ede64kJCmVGn43dh8FMYwBPYj5j5sI/cZNK9H 60TlHpg5cBC6ES95ZlLvTUFpCkEbM3pouhMvrDqlreHST72YVzaiyvWKKCZzPxpR UR8YRfWt7xCnxOTsOKZHC1F1WxEmA3axJURFyhlnOI9KiyV+S9s= =pW8j -----END PGP SIGNATURE-----
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index aa03e9d9..43484db3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -273,7 +273,7 @@ handle_deps() { if ! run_pacman -S --asdeps "${deplist[@]}"; then error "$(gettext "'%s' failed to install missing dependencies.")" "$PACMAN" - exit $E_INSTALL_DEPS_FAILED + return $R_DEPS_MISSING fi fi @@ -303,7 +303,7 @@ resolve_deps() { if handle_deps "${deplist[@]}"; then # check deps again to make sure they were resolved - deplist=$(check_deps "$@") || exit $E_INSTALL_DEPS_FAILED + deplist=$(check_deps "$@") [[ -z $deplist ]] && return $R_DEPS_SATISFIED fi
Fixes FS#63000 Signed-off-by: Allan McRae <allan@archlinux.org> --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)