aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-04-22 15:39:20 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-04-22 15:39:20 +0000
commitddfb8c51dbb303ebb8aefe1446fdec34b06e86c7 (patch)
treef241ee4f3ae041f2e7da84886ab0f9ee6af2b669 /scripts
parent2c1712ef7377b202625fdc37ab377458473b07c4 (diff)
downloadupstream-ddfb8c51dbb303ebb8aefe1446fdec34b06e86c7.tar.gz
upstream-ddfb8c51dbb303ebb8aefe1446fdec34b06e86c7.tar.bz2
upstream-ddfb8c51dbb303ebb8aefe1446fdec34b06e86c7.zip
metadata.pl: fix recursive handling of conditional dependencies
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21088 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/metadata.pl5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 70d1b40255..e0fb32fc11 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -423,8 +423,9 @@ sub mconf_depends {
my $vdep;
my $condition = $parent_condition;
- next if $seen->{$depend};
- $seen->{$depend} = 1;
+ next if $condition eq $depend;
+ next if $seen->{"$parent_condition:$depend"};
+ $seen->{"$parent_condition:$depend"} = 1;
if ($depend =~ /^(.+):(.+)$/) {
if ($1 ne "PACKAGE_$pkgname") {
if ($condition) {