Reset condition for each dependeny when generating mconf files. Previously all
authorLars-Peter Clausen <lars@metafoo.de>
Sun, 1 Feb 2009 01:16:01 +0000 (01:16 +0000)
committerLars-Peter Clausen <lars@metafoo.de>
Sun, 1 Feb 2009 01:16:01 +0000 (01:16 +0000)
dependencys listed after a conditional dependency had the same condition.

SVN-Revision: 14335

scripts/metadata.pl

index da29fdd..fa30556 100755 (executable)
@@ -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;
                                }