summaryrefslogtreecommitdiffstats
path: root/abuild.in
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-06-30 14:59:07 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-06-30 14:59:07 +0000
commitc30c346362223658980275d54d5b7911a3a7486c (patch)
treedba567119db93a0168d727aa665a3c2c423570e6 /abuild.in
parent991652c96c0af2f7faad2cc7f1fa751855c2c4a5 (diff)
downloadabuild-c30c346362223658980275d54d5b7911a3a7486c.tar.bz2
abuild-c30c346362223658980275d54d5b7911a3a7486c.tar.xz
abuild: detect and report conflicting dependencies properly
Diffstat (limited to 'abuild.in')
-rwxr-xr-xabuild.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/abuild.in b/abuild.in
index 0c94653..4034a86 100755
--- a/abuild.in
+++ b/abuild.in
@@ -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