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-Tag: reboot~20124
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=ceaa4bbe3c321003122bd277be4b7f609f33f8a3

metadata.pl: fix recursive handling of conditional dependencies

SVN-Revision: 21088
---

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