From 55041a1e106e793c5fd437644a9ce26a707b04d9 Mon Sep 17 00:00:00 2001
From: Timo Teräs <timo.teras@iki.fi>
Date: Thu, 12 Nov 2015 14:10:19 +0200
Subject: abuild: fix conflict checking

---
 abuild.in | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'abuild.in')

diff --git a/abuild.in b/abuild.in
index e44696b..38d6efd 100644
--- a/abuild.in
+++ b/abuild.in
@@ -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
-- 
cgit v1.2.3-60-g2f50