add support for conditional depends to the feeds script

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13004 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/scripts/feeds b/scripts/feeds
index 8ec0799..76d83af 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -290,8 +290,9 @@ sub install_package {
        foreach my $vpkg (@{$srcpackage{$src}}, $pkg) {
                foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}) {
                        next if $dep =~ /@/;
        foreach my $vpkg (@{$srcpackage{$src}}, $pkg) {
                foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}) {
                        next if $dep =~ /@/;

-                       next if $dep =~ /:/;

                        $dep =~ s/^\+//;
                        $dep =~ s/^\+//;

+                       $dep =~ s/^.+://;
+                       next unless $dep;

                        install_package($feed, $dep) == 0 or $ret = 1;
                }
        }
                        install_package($feed, $dep) == 0 or $ret = 1;
                }
        }