abuild: detect and report conflicting dependencies properly
This commit is contained in:
parent
991652c96c
commit
c30c346362
|
@ -841,15 +841,16 @@ builddeps() {
|
|||
# find which deps are missing
|
||||
for i in $deps; do
|
||||
if [ "${i#\!}" != "$i" ]; then
|
||||
list_has ${i#\!} $installed_deps \
|
||||
$APK info -q -e "${i#\!}" \
|
||||
&& conflicts="$conflicts ${i#\!}"
|
||||
elif ! deplist_has $i $installed_deps || [ -n "$upgrade" ]; then
|
||||
missing="$missing $i"
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
if [ -n "$conflicts" ]; then
|
||||
die "Conflicting package(s) installed:$conflics"
|
||||
error "Conflicting package(s) installed:$conflicts"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [ -z "$install_deps" ] && [ -z "$recursive" ]; then
|
||||
|
|
Loading…
Reference in New Issue