From 63350fa59b3e466203f183f7a0846668d1a3f22b Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 9 Mar 2010 15:51:40 +0000 Subject: [PATCH] scripts/metadata.pl: fix handling of multiple conditional depends on the same package SVN-Revision: 20085 --- scripts/metadata.pl | 4 ++-- 1 file 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 { -- 2.25.1