diff options
author | mirko <mirko@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-04-10 11:41:18 +0000 |
---|---|---|
committer | mirko <mirko@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-04-10 11:41:18 +0000 |
commit | 61c9b8665f411aed59f4a10f413d46603d2ebf25 (patch) | |
tree | e0a0bdc1d62e544ddb2f28b4d65e567e84660218 | |
parent | 8e028d3df05f062a5c716ac4753cc469b1650313 (diff) |
use parent-dependencies for all dependencies of a package, not only those which are conditional deendencies (thanks to lars (also for this commit message :P))
fixes bug #4917
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15187 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-x | scripts/metadata.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 1c80be4bd..1971607eb 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -415,12 +415,12 @@ sub mconf_depends { $depend =~ s/^([@\+]+)//; my $flags = $1; my $vdep; - my $condition; + my $condition = $parent_condition; if ($depend =~ /^(.+):(.+)$/) { if ($1 ne "PACKAGE_$pkgname") { - if ($parent_condition) { - $condition = "$parent_condition && $1"; + if ($condition) { + $condition = "$condition && $1"; } else { $condition = $1; } |