summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-11-12 14:10:19 +0200
committerTimo Teräs <timo.teras@iki.fi>2015-11-12 14:10:19 +0200
commit55041a1e106e793c5fd437644a9ce26a707b04d9 (patch)
tree0c131f2017323bbf23657e7253f9494996898c6a
parent680355db336cc4f3a0ef1d24a6dac79b4f94421d (diff)
downloadabuild-55041a1e106e793c5fd437644a9ce26a707b04d9.tar.gz
abuild-55041a1e106e793c5fd437644a9ce26a707b04d9.tar.bz2
abuild-55041a1e106e793c5fd437644a9ce26a707b04d9.tar.xz
abuild-55041a1e106e793c5fd437644a9ce26a707b04d9.zip
abuild: fix conflict checking
-rw-r--r--abuild.in14
1 files changed, 10 insertions, 4 deletions
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