diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-22 15:39:20 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-22 15:39:20 +0000 |
| commit | e711a7c8843438ad1d01382dca307112e5d40320 (patch) | |
| tree | f241ee4f3ae041f2e7da84886ab0f9ee6af2b669 | |
| parent | 5689b63c0601fbe461d6099393de6bd79317eee9 (diff) | |
metadata.pl: fix recursive handling of conditional dependencies
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21088 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | scripts/metadata.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 70d1b40255..e0fb32fc11 100755 --- 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) { |