summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xabuild5
1 files changed, 4 insertions, 1 deletions
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