From f42bf4d6cfcde855cb92c19484a48af5ed33d155 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sun, 1 Feb 2009 01:16:01 +0000 Subject: [PATCH] Reset condition for each dependeny when generating mconf files. Previously all dependencys listed after a conditional dependency had the same condition. SVN-Revision: 14335 --- scripts/metadata.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/metadata.pl b/scripts/metadata.pl index da29fdd895..fa30556205 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -375,7 +375,7 @@ sub mconf_depends { my $res; my $dep = shift; my $seen = shift; - my $condition = shift; + my $parent_condition = shift; $dep or $dep = {}; $seen or $seen = {}; @@ -386,11 +386,12 @@ sub mconf_depends { $depend =~ s/^([@\+]+)//; my $flags = $1; my $vdep; + my $condition; if ($depend =~ /^(.+):(.+)$/) { if ($1 ne "PACKAGE_$pkgname") { - if ($condition) { - $condition = "$condition && $1"; + if ($parent_condition) { + $condition = "$parent_condition && $1"; } else { $condition = $1; } -- 2.30.2