summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-09 15:51:40 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-09 15:51:40 +0000
commit330b8a44a5d7a650b0f5348f2dee4f9c9b786477 (patch)
treec2be3f83ff7cc352b07adc47f08d65b40e3c9fe0 /scripts
parent3439dece431287e553864686d1c8164bebdcd39c (diff)
scripts/metadata.pl: fix handling of multiple conditional depends on the same package
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20085 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/metadata.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index c963964ba..70d1b4025 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -423,6 +423,8 @@ sub mconf_depends {
my $vdep;
my $condition = $parent_condition;
+ next if $seen->{$depend};
+ $seen->{$depend} = 1;
if ($depend =~ /^(.+):(.+)$/) {
if ($1 ne "PACKAGE_$pkgname") {
if ($condition) {
@@ -433,9 +435,7 @@ sub mconf_depends {
}
$depend = $2;
}
- next if $seen->{$depend};
next if $package{$depend} and $package{$depend}->{buildonly};
- $seen->{$depend} = 1;
if ($vdep = $package{$depend}->{vdepends}) {
$depend = join("||", map { "PACKAGE_".$_ } @$vdep);
} else {