From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 22 Apr 2010 15:39:20 +0000 (+0000)
Subject: metadata.pl: fix recursive handling of conditional dependencies
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=ddfb8c51dbb303ebb8aefe1446fdec34b06e86c7;p=15.05%2Fopenwrt.git

metadata.pl: fix recursive handling of conditional dependencies

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21088 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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) {