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 | df90f52b5a93b26ce98e8e8fee058e1c6a9e0c8f (patch) | |
tree | b5059f0f260f3b011735b993eb83630f273da816 /scripts | |
parent | b4dc9c47effa2fc17b8c793d651db7498ba937c0 (diff) | |
download | upstream-df90f52b5a93b26ce98e8e8fee058e1c6a9e0c8f.tar.gz upstream-df90f52b5a93b26ce98e8e8fee058e1c6a9e0c8f.tar.bz2 upstream-df90f52b5a93b26ce98e8e8fee058e1c6a9e0c8f.zip |
add support for conditional depends to the feeds script
SVN-Revision: 13004
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; } } |