diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2008-10-18 19:36:44 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2008-10-18 19:36:44 +0000 |
| commit | e01192451189a33a5b9dc501fd3cbb1c596e30a2 (patch) | |
| tree | a382afa4e3c11ccb3922695f1591b1e440b729ce /scripts | |
| parent | ccf505ab9d90135994915028855572807d572cc7 (diff) | |
| download | master-187ad058-e01192451189a33a5b9dc501fd3cbb1c596e30a2.tar.gz master-187ad058-e01192451189a33a5b9dc501fd3cbb1c596e30a2.tar.bz2 master-187ad058-e01192451189a33a5b9dc501fd3cbb1c596e30a2.zip | |
add support for conditional depends to the feeds script
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13004 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/feeds | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/feeds b/scripts/feeds index 8ec0799f70..76d83af9a3 100755 --- 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 =~ /@/; - next if $dep =~ /:/; $dep =~ s/^\+//; + $dep =~ s/^.+://; + next unless $dep; install_package($feed, $dep) == 0 or $ret = 1; } } |