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
SVN-Revision: 15187
This commit is contained in:
parent
1929c7511c
commit
9af0ab6efa
1 changed files with 3 additions and 3 deletions
|
@ -415,12 +415,12 @@ sub mconf_depends {
|
||||||
$depend =~ s/^([@\+]+)//;
|
$depend =~ s/^([@\+]+)//;
|
||||||
my $flags = $1;
|
my $flags = $1;
|
||||||
my $vdep;
|
my $vdep;
|
||||||
my $condition;
|
my $condition = $parent_condition;
|
||||||
|
|
||||||
if ($depend =~ /^(.+):(.+)$/) {
|
if ($depend =~ /^(.+):(.+)$/) {
|
||||||
if ($1 ne "PACKAGE_$pkgname") {
|
if ($1 ne "PACKAGE_$pkgname") {
|
||||||
if ($parent_condition) {
|
if ($condition) {
|
||||||
$condition = "$parent_condition && $1";
|
$condition = "$condition && $1";
|
||||||
} else {
|
} else {
|
||||||
$condition = $1;
|
$condition = $1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue