From e711a7c8843438ad1d01382dca307112e5d40320 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 22 Apr 2010 15:39:20 +0000 Subject: metadata.pl: fix recursive handling of conditional dependencies git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21088 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- scripts/metadata.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 70d1b4025..e0fb32fc1 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) { -- cgit v1.2.3