qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 20:41:53 +02:00
Code

metadata.pl: fix recursive handling of conditional dependencies

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21088 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2010-04-22 15:39:20 +00:00
parent 5689b63c06
commit e711a7c884
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/metadata.pl
View File

@ -423,8 +423,9 @@ sub mconf_depends {
my $vdep; my $vdep;
my $condition = $parent_condition; my $condition = $parent_condition;
next if $seen->{$depend}; next if $condition eq $depend;
$seen->{$depend} = 1; next if $seen->{"$parent_condition:$depend"};
$seen->{"$parent_condition:$depend"} = 1;
if ($depend =~ /^(.+):(.+)$/) { if ($depend =~ /^(.+):(.+)$/) {
if ($1 ne "PACKAGE_$pkgname") { if ($1 ne "PACKAGE_$pkgname") {
if ($condition) { if ($condition) {