diff options
| -rw-r--r-- | abuild.in | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -1737,15 +1737,21 @@ builddeps() { # find which deps are missing for i in $builddeps; do - if [ "${i#\!}" != "$i" ] && $APK info --quiet --installed "${i#\!}"; then - error "Conflicting package installed: ${i#\!}" + if [ "${i#\!}" != "$i" ]; then + if $APK info --quiet --installed "${i#\!}"; then + error "Conflicting package installed: ${i#\!}" + return 1 + fi elif ! deplist_has $i $installed_builddeps || [ -n "$upgrade" ]; then missing="$missing $i" fi done for i in $hostdeps; do - if [ "${i#\!}" != "$i" ] && $APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}"; then - error "Conflicting package installed: ${i#\!}" + if [ "${i#\!}" != "$i" ]; then + if $APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}"; then + error "Conflicting package installed: ${i#\!}" + return 1 + fi elif ! deplist_has $i $installed_hostdeps || [ -n "$upgrade" ]; then missing="$missing $i" fi |