summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMirko Vogt <mirko@openwrt.org>2009-04-10 11:41:18 +0000
committerMirko Vogt <mirko@openwrt.org>2009-04-10 11:41:18 +0000
commit9af0ab6efad781939a6440b71c6539f0af9ec717 (patch)
treedb85356b585474d3cf94fa4400b0a0616e5a19fd
parent1929c7511c2c726063853a89c10011d6baeb491c (diff)
downloadmtk-20170518-9af0ab6efad781939a6440b71c6539f0af9ec717.zip
mtk-20170518-9af0ab6efad781939a6440b71c6539f0af9ec717.tar.gz
mtk-20170518-9af0ab6efad781939a6440b71c6539f0af9ec717.tar.bz2
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
-rwxr-xr-xscripts/metadata.pl6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 1c80be4..1971607 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;
}