diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2008-10-04 16:22:24 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2008-10-04 16:22:24 +0000 |
| commit | 009e41906f494a0ea5ff0d212b318a291c0cd0b0 (patch) | |
| tree | 2c7c8343fa75e1df0fa9b3de635b2d1764e1bc5f /scripts/metadata.pl | |
| parent | b9222805f03bfc41e6b13a1c7081569913512e49 (diff) | |
| download | master-31e0f0ae-009e41906f494a0ea5ff0d212b318a291c0cd0b0.tar.gz master-31e0f0ae-009e41906f494a0ea5ff0d212b318a291c0cd0b0.tar.bz2 master-31e0f0ae-009e41906f494a0ea5ff0d212b318a291c0cd0b0.zip | |
fix infinite recursion in metadata.pl
SVN-Revision: 12851
Diffstat (limited to 'scripts/metadata.pl')
| -rwxr-xr-x | scripts/metadata.pl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl index e05cc92c42..9c10f9554c 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -367,7 +367,9 @@ sub mconf_depends($$) { my $only_dep = shift; my $res; my $dep = shift; + my $seen = shift; $dep or $dep = {}; + $seen or $seen = {}; $depends or return; my @depends = @$depends; @@ -382,6 +384,8 @@ sub mconf_depends($$) { $condition = $1; $depend = $2; } + next if $seen->{$depend}; + $seen->{$depend} = 1; if ($vdep = $package{$depend}->{vdepends}) { $depend = join("||", map { "PACKAGE_".$_ } @$vdep); } else { @@ -390,7 +394,7 @@ sub mconf_depends($$) { # thus if FOO depends on other config options, these dependencies # will not be checked. To fix this, we simply emit all of FOO's # depends here as well. - $package{$depend} and mconf_depends($package{$depend}->{depends}, 1, $dep); + $package{$depend} and mconf_depends($package{$depend}->{depends}, 1, $dep, $seen); $m = "select"; next if $only_dep; |