From 51d02a9a2e21c50a7dbd045b28b7f7e876396b8c Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 4 Aug 2008 22:03:28 +0000 Subject: 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 --- scripts/feeds | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'scripts/feeds') 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; -- cgit v1.2.3