metadata.pl: fix recursive handling of conditional dependencies
authorFelix Fietkau <nbd@openwrt.org>
Thu, 22 Apr 2010 15:39:20 +0000 (15:39 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Thu, 22 Apr 2010 15:39:20 +0000 (15:39 +0000)
SVN-Revision: 21088

scripts/metadata.pl

index 70d1b40..e0fb32f 100755 (executable)
@@ -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) {