Skip to content
Snippets Groups Projects
Commit c30c3463 authored by Natanael Copa's avatar Natanael Copa
Browse files

abuild: detect and report conflicting dependencies properly

parent 991652c9
No related branches found
No related tags found
No related merge requests found
...@@ -841,15 +841,16 @@ builddeps() { ...@@ -841,15 +841,16 @@ builddeps() {
# find which deps are missing # find which deps are missing
for i in $deps; do for i in $deps; do
if [ "${i#\!}" != "$i" ]; then if [ "${i#\!}" != "$i" ]; then
list_has ${i#\!} $installed_deps \ $APK info -q -e "${i#\!}" \
&& conflicts="$conflicts ${i#\!}" && conflicts="$conflicts ${i#\!}"
elif ! deplist_has $i $installed_deps || [ -n "$upgrade" ]; then elif ! deplist_has $i $installed_deps || [ -n "$upgrade" ]; then
missing="$missing $i" missing="$missing $i"
fi fi
done done
if [ -n "$conflicts" ]; then if [ -n "$conflicts" ]; then
die "Conflicting package(s) installed:$conflics" error "Conflicting package(s) installed:$conflicts"
return 1
fi fi
if [ -z "$install_deps" ] && [ -z "$recursive" ]; then if [ -z "$install_deps" ] && [ -z "$recursive" ]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment