abuild: improve error message when conflicting packages are installed
This commit is contained in:
parent
b7c197f20c
commit
a5caab30c9
|
@ -1558,15 +1558,15 @@ builddeps() {
|
||||||
|
|
||||||
# find which deps are missing
|
# find which deps are missing
|
||||||
for i in $builddeps; do
|
for i in $builddeps; do
|
||||||
if [ "${i#\!}" != "$i" ]; then
|
if [ "${i#\!}" != "$i" ] && $APK info --quiet --installed "${i#\!}"; then
|
||||||
$APK info --quiet --installed "${i#\!}"
|
error "Conflicting package installed: ${i#\!}"
|
||||||
elif ! deplist_has $i $installed_builddeps || [ -n "$upgrade" ]; then
|
elif ! deplist_has $i $installed_builddeps || [ -n "$upgrade" ]; then
|
||||||
missing="$missing $i"
|
missing="$missing $i"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
for i in $hostdeps; do
|
for i in $hostdeps; do
|
||||||
if [ "${i#\!}" != "$i" ]; then
|
if [ "${i#\!}" != "$i" ] && $APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}"; then
|
||||||
$APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}"
|
error "Conflicting package installed: ${i#\!}"
|
||||||
elif ! deplist_has $i $installed_hostdeps || [ -n "$upgrade" ]; then
|
elif ! deplist_has $i $installed_hostdeps || [ -n "$upgrade" ]; then
|
||||||
missing="$missing $i"
|
missing="$missing $i"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue