diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-03-09 15:51:40 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-03-09 15:51:40 +0000 |
| commit | 63350fa59b3e466203f183f7a0846668d1a3f22b (patch) | |
| tree | 3d921063d292785804d34bbadb67e8a22c466c71 | |
| parent | cfaeab171afce331574c3fb4e460a9301e170e83 (diff) | |
| download | upstream-63350fa59b3e466203f183f7a0846668d1a3f22b.tar.gz upstream-63350fa59b3e466203f183f7a0846668d1a3f22b.tar.bz2 upstream-63350fa59b3e466203f183f7a0846668d1a3f22b.zip | |
scripts/metadata.pl: fix handling of multiple conditional depends on the same package
SVN-Revision: 20085
| -rwxr-xr-x | scripts/metadata.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl index c963964ba3..70d1b40255 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -423,6 +423,8 @@ sub mconf_depends { my $vdep; my $condition = $parent_condition; + next if $seen->{$depend}; + $seen->{$depend} = 1; if ($depend =~ /^(.+):(.+)$/) { if ($1 ne "PACKAGE_$pkgname") { if ($condition) { @@ -433,9 +435,7 @@ sub mconf_depends { } $depend = $2; } - next if $seen->{$depend}; next if $package{$depend} and $package{$depend}->{buildonly}; - $seen->{$depend} = 1; if ($vdep = $package{$depend}->{vdepends}) { $depend = join("||", map { "PACKAGE_".$_ } @$vdep); } else { |