From a5caab30c9cc5ea5209f5394f456d9f9b42717a6 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 29 Dec 2014 12:54:52 +0000
Subject: abuild: improve error message when conflicting packages are installed

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

(limited to 'abuild.in')

diff --git a/abuild.in b/abuild.in
index 814f88f..e4e5091 100644
--- a/abuild.in
+++ b/abuild.in
@@ -1558,15 +1558,15 @@ builddeps() {
 
 	# find which deps are missing
 	for i in $builddeps; do
-		if [ "${i#\!}" != "$i" ]; then
-			$APK info --quiet --installed "${i#\!}"
+		if [ "${i#\!}" != "$i" ] && $APK info --quiet --installed "${i#\!}"; then
+			error "Conflicting package installed: ${i#\!}"
 		elif ! deplist_has $i $installed_builddeps || [ -n "$upgrade" ]; then
 			missing="$missing $i"
 		fi
 	done
 	for i in $hostdeps; do
-		if [ "${i#\!}" != "$i" ]; then
-			$APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}"
+		if [ "${i#\!}" != "$i" ] && $APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}"; then
+			error "Conflicting package installed: ${i#\!}"
 		elif ! deplist_has $i $installed_hostdeps || [ -n "$upgrade" ]; then
 			missing="$missing $i"
 		fi
-- 
cgit v1.2.3