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

abuild: bugfix for versioned dependencies 

we need strip all '<>=' chars not only last
This commit is contained in:
Natanael Copa 2010-05-06 18:31:36 +00:00
parent 18c1dde2de
commit e3c46369fd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
abuild.in
View File

@ -748,7 +748,7 @@ depparse_aports() {
case "$j" in case "$j" in
!*) continue;; !*) continue;;
esac esac
deps="$deps ${j%[<>=]*}" deps="$deps ${j%%[<>=]*}"
done done
for j in $pkgname $subpackages; do for j in $pkgname $subpackages; do
echo "o ${j%%:*} $dir" echo "o ${j%%:*} $dir"
@ -769,7 +769,7 @@ deptrace() {
local deps= i= local deps= i=
# strip versions from deps # strip versions from deps
for i in "$@"; do for i in "$@"; do
deps="$deps ${i%[<>=]*}" deps="$deps ${i%%[<>=]*}"
done done
[ -z "$deps" ] && return 0 [ -z "$deps" ] && return 0
( depparse_aports ( depparse_aports
@ -811,7 +811,7 @@ builddeps() {
# add depends unless it is a subpackage # add depends unless it is a subpackage
for i in $depends; do for i in $depends; do
subpackages_has ${i%[<>=]*} || deps="$deps $i" subpackages_has ${i%%[<>=]*} || deps="$deps $i"
done done
installed_deps=$($APK info -e $deps) installed_deps=$($APK info -e $deps)
@ -848,7 +848,7 @@ builddeps() {
# find dependencies that are installed but missing in repo. # find dependencies that are installed but missing in repo.
for i in $deps; do for i in $deps; do
local m=$($APK search --repository "$abuildrepo" ${i%[<>=]*}) local m=$($APK search --repository "$abuildrepo" ${i%%[<>=]*})
if [ -z "$m" ]; then if [ -z "$m" ]; then
missing="$missing $i" missing="$missing $i"
fi fi
@ -934,7 +934,7 @@ deplist_has() {
local i local i
shift shift
for i in $@; do for i in $@; do
i=${i%[<>=]*} i=${i%%[<>=]*}
[ "$needle" = "$i" ] && return 0 [ "$needle" = "$i" ] && return 0
[ "$needle" = "!$i" ] && return 1 [ "$needle" = "!$i" ] && return 1
done done