aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-02-01 01:16:01 +0000
committerLars-Peter Clausen <lars@metafoo.de>2009-02-01 01:16:01 +0000
commitf42bf4d6cfcde855cb92c19484a48af5ed33d155 (patch)
tree7618468e1488d93bd800ba15b0e1a3d3e4eb5a69 /scripts
parent5901305e2bfa059459c6aec33fe3ba63b3df3c0d (diff)
downloadupstream-f42bf4d6cfcde855cb92c19484a48af5ed33d155.tar.gz
upstream-f42bf4d6cfcde855cb92c19484a48af5ed33d155.tar.bz2
upstream-f42bf4d6cfcde855cb92c19484a48af5ed33d155.zip
Reset condition for each dependeny when generating mconf files. Previously all dependencys listed after a conditional dependency had the same condition.
SVN-Revision: 14335
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/metadata.pl7
1 files 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;
}