From 64299ccfbb28893cb0bd8cf90025ad718aeacf65 Mon Sep 17 00:00:00 2001 From: Felix Yan Date: Sun, 10 Mar 2024 23:27:53 +0000 Subject: [PATCH] makepkg.sh: skip checking buildtime deps when runtime check already failed This could help locate the real failure (instead of scrolling through the whole possibly-successful buildtime dep installation section) and also saves time on the operation. --- scripts/makepkg.sh.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bfbb8b34..dbb24da3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1319,11 +1319,13 @@ else original_pkglist=($(run_pacman -Qq)) # required by remove_dep fi - msg "$(gettext "Checking buildtime dependencies...")" - if (( CHECKFUNC )); then - resolve_deps "${makedepends[@]}" "${checkdepends[@]}" || deperr=1 - else - resolve_deps "${makedepends[@]}" || deperr=1 + if (( ! deperr )); then + msg "$(gettext "Checking buildtime dependencies...")" + if (( CHECKFUNC )); then + resolve_deps "${makedepends[@]}" "${checkdepends[@]}" || deperr=1 + else + resolve_deps "${makedepends[@]}" || deperr=1 + fi fi if (( RMDEPS )); then