RepoMirrors
/
abuild
mirror of https://gitlab.alpinelinux.org/alpine/abuild.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

abuild: fix conflict checking

This commit is contained in:
Timo Teräs 2015-11-12 14:10:19 +02:00
parent 680355db33
commit 55041a1e10
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
abuild.in
View File

@ -1737,15 +1737,21 @@ builddeps() {
# find which deps are missing
for i in $builddeps; do
if [ "${i#\!}" != "$i" ] && $APK info --quiet --installed "${i#\!}"; then
error "Conflicting package installed: ${i#\!}"
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
error "Conflicting package installed: ${i#\!}"
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