fix scripts/feeds dependency lookup: process deps for all virtual packages of a src...
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 4 Aug 2008 22:03:28 +0000 (22:03 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 4 Aug 2008 22:03:28 +0000 (22:03 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12101 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds

index 78e65ad1d5c184584d34a122bd8376751885141d..f1baad5766dd2742c78c40211a5afd1f9e0b6f90 100755 (executable)
@@ -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;