diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-04-22 15:39:20 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-04-22 15:39:20 +0000 |
| commit | ceaa4bbe3c321003122bd277be4b7f609f33f8a3 (patch) | |
| tree | 72dd6f60ca0597a4b48703389ffbdba61b410cce /scripts | |
| parent | ca3e07d6394388680c330dce2c07cdbc8a8711b4 (diff) | |
| download | master-31e0f0ae-ceaa4bbe3c321003122bd277be4b7f609f33f8a3.tar.gz master-31e0f0ae-ceaa4bbe3c321003122bd277be4b7f609f33f8a3.tar.bz2 master-31e0f0ae-ceaa4bbe3c321003122bd277be4b7f609f33f8a3.zip | |
metadata.pl: fix recursive handling of conditional dependencies
SVN-Revision: 21088
Diffstat (limited to 'scripts')
| -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) { |