metadata.pl: fix recursive handling of conditional dependencies

SVN-Revision: 21088
15 years ago · ceaa4bbe3c
parent ca3e07d639
commit ceaa4bbe3c
1 changed files with 3 additions and 2 deletions
--- 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) {