scripts/metadata.pl: fix handling of multiple conditional depends on the same package
SVN-Revision: 20085
This commit is contained in:
parent
cfaeab171a
commit
63350fa59b
1 changed files with 2 additions and 2 deletions
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue