aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/feeds
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-08-04 22:03:28 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-08-04 22:03:28 +0000
commit311553c77bc33c1b730d7308109bad34b07a6cbf (patch)
treea0fd4e36f62e89a88ca9419296a31758688bd468 /scripts/feeds
parentd38b4fd256a6018e220ec3ac2a7856d520f990da (diff)
downloadupstream-311553c77bc33c1b730d7308109bad34b07a6cbf.tar.gz
upstream-311553c77bc33c1b730d7308109bad34b07a6cbf.tar.bz2
upstream-311553c77bc33c1b730d7308109bad34b07a6cbf.zip
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
SVN-Revision: 12101
Diffstat (limited to 'scripts/feeds')
-rwxr-xr-xscripts/feeds10
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/feeds b/scripts/feeds
index 78e65ad1d5..f1baad5766 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;