summaryrefslogtreecommitdiff
path: root/abuild.in
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-05-06 18:31:36 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-05-06 18:31:36 +0000
commite3c46369fd33b9a83447802dbe5b61f895f80b88 (patch)
tree35e309565bbc6536b8a38e8fee0ed1cc5373f906 /abuild.in
parent18c1dde2def1fe2b928a69c00ff0d6616fb0be45 (diff)
downloadabuild-e3c46369fd33b9a83447802dbe5b61f895f80b88.tar.gz
abuild-e3c46369fd33b9a83447802dbe5b61f895f80b88.tar.bz2
abuild-e3c46369fd33b9a83447802dbe5b61f895f80b88.tar.xz
abuild-e3c46369fd33b9a83447802dbe5b61f895f80b88.zip
abuild: bugfix for versioned dependencies
we need strip all '<>=' chars not only last
Diffstat (limited to 'abuild.in')
-rwxr-xr-xabuild.in10
1 files changed, 5 insertions, 5 deletions
diff --git a/abuild.in b/abuild.in
index 5e345f9..8551f99 100755
--- a/abuild.in
+++ b/abuild.in
@@ -748,7 +748,7 @@ depparse_aports() {
case "$j" in
!*) continue;;
esac
- deps="$deps ${j%[<>=]*}"
+ deps="$deps ${j%%[<>=]*}"
done
for j in $pkgname $subpackages; do
echo "o ${j%%:*} $dir"
@@ -769,7 +769,7 @@ deptrace() {
local deps= i=
# strip versions from deps
for i in "$@"; do
- deps="$deps ${i%[<>=]*}"
+ deps="$deps ${i%%[<>=]*}"
done
[ -z "$deps" ] && return 0
( depparse_aports
@@ -811,7 +811,7 @@ builddeps() {
# add depends unless it is a subpackage
for i in $depends; do
- subpackages_has ${i%[<>=]*} || deps="$deps $i"
+ subpackages_has ${i%%[<>=]*} || deps="$deps $i"
done
installed_deps=$($APK info -e $deps)
@@ -848,7 +848,7 @@ builddeps() {
# find dependencies that are installed but missing in repo.
for i in $deps; do
- local m=$($APK search --repository "$abuildrepo" ${i%[<>=]*})
+ local m=$($APK search --repository "$abuildrepo" ${i%%[<>=]*})
if [ -z "$m" ]; then
missing="$missing $i"
fi
@@ -934,7 +934,7 @@ deplist_has() {
local i
shift
for i in $@; do
- i=${i%[<>=]*}
+ i=${i%%[<>=]*}
[ "$needle" = "$i" ] && return 0
[ "$needle" = "!$i" ] && return 1
done