domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/metadata.pl: fix handling of multiple conditional depends on the same package

Browse Source 
SVN-Revision: 20085
This commit is contained in:
Felix Fietkau
2010-03-09 15:51:40 +00:00
parent cfaeab171a
commit 63350fa59b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/metadata.pl
View File

@@ -423,6 +423,8 @@ sub mconf_depends {
my $vdep; my $vdep;
my $condition = $parent_condition; my $condition = $parent_condition;
next if $seen->{$depend};
$seen->{$depend} = 1;
if ($depend =~ /^(.+):(.+)$/) { if ($depend =~ /^(.+):(.+)$/) {
if ($1 ne "PACKAGE_$pkgname") { if ($1 ne "PACKAGE_$pkgname") {
if ($condition) { if ($condition) {
@@ -433,9 +435,7 @@ sub mconf_depends {
} }
$depend = $2; $depend = $2;
} }
next if $seen->{$depend};
next if $package{$depend} and $package{$depend}->{buildonly}; next if $package{$depend} and $package{$depend}->{buildonly};
$seen->{$depend} = 1;
if ($vdep = $package{$depend}->{vdepends}) { if ($vdep = $package{$depend}->{vdepends}) {
$depend = join("||", map { "PACKAGE_".$_ } @$vdep); $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
} else { } else {