From: Mirko Vogt <mirko@openwrt.org>
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.lede-project.org./?a=commitdiff_plain;h=9af0ab6efad781939a6440b71c6539f0af9ec717;p=openwrt%2Fstaging%2Frobimarko.git

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

SVN-Revision: 15187
---

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 1c80be4bdb..1971607ebb 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;
 				}