From 31800c29b03fe4268985b9761b4ccdabfad7a041 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 4 Oct 2008 16:22:24 +0000
Subject: fix infinite recursion in metadata.pl

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12851 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 scripts/metadata.pl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'scripts/metadata.pl')

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index e05cc92c4..9c10f9554 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;
-- 
cgit v1.2.3