From: mirko <mirko@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 10 Apr 2009 11:41:18 +0000 (+0000)
Subject: use parent-dependencies for all dependencies of a package, not only those which are... 
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=61c9b8665f411aed59f4a10f413d46603d2ebf25

use parent-dependencies for all dependencies of a package, not only those which are conditional deendencies (thanks to lars (also for this commit message :P))
fixes bug #4917


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

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 1c80be4bd..1971607eb 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -415,12 +415,12 @@ sub mconf_depends {
 		$depend =~ s/^([@\+]+)//;
 		my $flags = $1;
 		my $vdep;
-		my $condition;
+		my $condition = $parent_condition;
 
 		if ($depend =~ /^(.+):(.+)$/) {
 			if ($1 ne "PACKAGE_$pkgname") {
-				if ($parent_condition) {
-					$condition = "$parent_condition && $1";
+				if ($condition) {
+					$condition = "$condition && $1";
 				} else {
 					$condition = $1;
 				}