add support for conditional depends to the feeds script
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sat, 18 Oct 2008 19:36:44 +0000 (19:36 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sat, 18 Oct 2008 19:36:44 +0000 (19:36 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13004 3c298f89-4303-0410-b956-a3cf2f4a3e73

scripts/feeds

index 8ec0799..76d83af 100755 (executable)
@@ -290,8 +290,9 @@ sub install_package {
        foreach my $vpkg (@{$srcpackage{$src}}, $pkg) {
                foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}) {
                        next if $dep =~ /@/;
-                       next if $dep =~ /:/;
                        $dep =~ s/^\+//;
+                       $dep =~ s/^.+://;
+                       next unless $dep;
                        install_package($feed, $dep) == 0 or $ret = 1;
                }
        }