aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
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
commita7cdeaabce2b58ff43d110ebabe9901ea1ecfb29 (patch)
treee0a0bdc1d62e544ddb2f28b4d65e567e84660218 /scripts
parentbbdb00cc4e784ebfdfe0385fd800b4789763bc39 (diff)
downloadupstream-a7cdeaabce2b58ff43d110ebabe9901ea1ecfb29.tar.gz
upstream-a7cdeaabce2b58ff43d110ebabe9901ea1ecfb29.tar.bz2
upstream-a7cdeaabce2b58ff43d110ebabe9901ea1ecfb29.zip
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
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/metadata.pl6
1 files changed, 3 insertions, 3 deletions
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;
}