summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-04-02 11:32:33 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-04-02 11:32:33 +0000
commit779ff4078ffba497c3e46187226d3602702c5b71 (patch)
treebfa7ec38168db5c61bc8d7453937ffb65131217b
parent0dff05bda23e79083c6a328e23765bab6c33a3b1 (diff)
downloadabuild-779ff4078ffba497c3e46187226d3602702c5b71.tar.bz2
abuild-779ff4078ffba497c3e46187226d3602702c5b71.tar.xz
abuild: filter out conflicts when building dependencies
-rwxr-xr-xabuild10
1 files changed, 9 insertions, 1 deletions
diff --git a/abuild b/abuild
index 58d892f..80d1e2e 100755
--- a/abuild
+++ b/abuild
@@ -481,9 +481,17 @@ depparse_aports() {
makedepends=
. $i
dir=${i%/APKBUILD}
+ deps=
+ # filter out conflicts from deps
+ for j in $depends $makedepends; do
+ case "$j" in
+ !*) continue;;
+ esac
+ deps="$deps $j"
+ done
for j in $pkgname $subpackages; do
echo "o ${j%%:*} $dir"
- set -- $depends $makedepends
+ set -- $deps
echo -n "d ${j%%:*} $1"
shift
while [ $# -gt 0 ]; do