Explorar o código

metadata.pl: fix recursive handling of conditional dependencies

SVN-Revision: 21088
Felix Fietkau %!s(int64=15) %!d(string=hai) anos
pai
achega
ceaa4bbe3c
Modificáronse 1 ficheiros con 3 adicións e 2 borrados
  1. 3 2
      scripts/metadata.pl

+ 3 - 2
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) {