From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 9 Mar 2010 15:51:40 +0000 (+0000)
Subject: scripts/metadata.pl: fix handling of multiple conditional depends on the same package
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=330b8a44a5d7a650b0f5348f2dee4f9c9b786477

scripts/metadata.pl: fix handling of multiple conditional depends on the same package

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

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index c963964ba..70d1b4025 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -423,6 +423,8 @@ sub mconf_depends {
 		my $vdep;
 		my $condition = $parent_condition;
 
+		next if $seen->{$depend};
+		$seen->{$depend} = 1;
 		if ($depend =~ /^(.+):(.+)$/) {
 			if ($1 ne "PACKAGE_$pkgname") {
 				if ($condition) {
@@ -433,9 +435,7 @@ sub mconf_depends {
 			}
 			$depend = $2;
 		}
-		next if $seen->{$depend};
 		next if $package{$depend} and $package{$depend}->{buildonly};
-		$seen->{$depend} = 1;
 		if ($vdep = $package{$depend}->{vdepends}) {
 			$depend = join("||", map { "PACKAGE_".$_ } @$vdep);
 		} else {