summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-08-04 22:03:28 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-08-04 22:03:28 +0000
commit51d02a9a2e21c50a7dbd045b28b7f7e876396b8c (patch)
treeae5de275b8ac65e07465b763754552a84a275f8f
parent7fee7d1f224b8c02dd8eba0bdb388ab7c504ad99 (diff)
fix scripts/feeds dependency lookup: process deps for all virtual packages of a src package that belongs to the package that the user wants to install
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12101 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xscripts/feeds10
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/feeds b/scripts/feeds
index 78e65ad1d..f1baad576 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -280,10 +280,12 @@ sub install_package {
};
# install all dependencies
- foreach my $dep (@{$pkg->{depends}}, @{$pkg->{builddepends}}) {
- next if $dep =~ /@/;
- $dep =~ s/^\+//;
- install_package($feed, $dep) == 0 or $ret = 1;
+ foreach my $vpkg (@{$srcpackage{$src}}) {
+ foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}) {
+ next if $dep =~ /@/;
+ $dep =~ s/^\+//;
+ install_package($feed, $dep) == 0 or $ret = 1;
+ }
}
return $ret;