add support for conditional depends to the feeds script
authorFelix Fietkau <nbd@openwrt.org>
Sat, 18 Oct 2008 19:36:44 +0000 (19:36 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sat, 18 Oct 2008 19:36:44 +0000 (19:36 +0000)
SVN-Revision: 13004

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 =~ /@/;
        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;
                }
        }