From 6d402b272f8bff60f5c9e7d9e55085bacd21c609 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 26 Mar 2009 09:31:51 +0000 Subject: [PATCH] abuild: support for conflicts in makedepends prefix a makedepends with ! and its treated as a conflict. for example: makedepends="zlib-dev !gettext" --- abuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abuild b/abuild index c732eb4..08ae2c0 100755 --- a/abuild +++ b/abuild @@ -541,7 +541,10 @@ builddeps() { # find which deps are missing for i in $deps; do - if ! apk info -e $i; then + if [ "${i#\!}" != "$i" ]; then + apk info -e ${i#\!} \ + && die "Conflicting package ${i#\!} is installed." + elif ! apk info -e $i; then if [ -z "$install_deps" ] && [ -z "$recursive" ]; then die "Missing dependency $i. Use -r to autoinstall or -R to build" fi