aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-03-09 15:51:40 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-03-09 15:51:40 +0000
commit6ac33df3ad0d97f59976367ba54a9cc662cd8b68 (patch)
treec2be3f83ff7cc352b07adc47f08d65b40e3c9fe0 /scripts
parent78ad6f8bbe04ac29ea6e86d7c7ab5c139d36450c (diff)
downloadupstream-6ac33df3ad0d97f59976367ba54a9cc662cd8b68.tar.gz
upstream-6ac33df3ad0d97f59976367ba54a9cc662cd8b68.tar.bz2
upstream-6ac33df3ad0d97f59976367ba54a9cc662cd8b68.zip
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 c963964ba3..70d1b40255 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 {