metadata.pl: fix recursive handling of conditional dependencies

SVN-Revision: 21088

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 70d1b40255847328d14a607ee767a82fcd41c3a7..e0fb32fc1189608fadf8209fd54d64ef35dd5b25 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -423,8 +423,9 @@ sub mconf_depends {
                my $vdep;
                my $condition = $parent_condition;
 
-               next if $seen->{$depend};
-               $seen->{$depend} = 1;
+               next if $condition eq $depend;
+               next if $seen->{"$parent_condition:$depend"};
+               $seen->{"$parent_condition:$depend"} = 1;
                if ($depend =~ /^(.+):(.+)$/) {
                        if ($1 ne "PACKAGE_$pkgname") {
                                if ($condition) {