From a7cdeaabce2b58ff43d110ebabe9901ea1ecfb29 Mon Sep 17 00:00:00 2001
From: Mirko Vogt <mirko@openwrt.org>
Date: Fri, 10 Apr 2009 11:41:18 +0000
Subject: 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
---
 scripts/metadata.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts/metadata.pl')

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;
 				}
-- 
cgit v1.2.3