Commit 55041a1e authored by Timo Teräs's avatar Timo Teräs

abuild: fix conflict checking

parent 680355db
......@@ -1737,15 +1737,21 @@ builddeps() {
# find which deps are missing
for i in $builddeps; do
if [ "${i#\!}" != "$i" ] && $APK info --quiet --installed "${i#\!}"; then
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
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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment