From 3f3f04ffd27182f5f93672083bea75b564e2cb42 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 13 Apr 2008 22:36:51 +0000 Subject: [PATCH] install dependencies after installing package to avoid deep recursion and mass memory consuption git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10823 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- scripts/feeds | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/feeds b/scripts/feeds index 2b50d5c1a..78e65ad1d 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -264,13 +264,6 @@ sub install_package { # newly installed packages set the source package $installed{$src} and return 0; - # install all dependencies - foreach my $dep (@{$pkg->{depends}}, @{$pkg->{builddepends}}) { - next if $dep =~ /@/; - $dep =~ s/^\+//; - install_package($feed, $dep) == 0 or $ret = 1; - } - # check previously installed packages $installed{$name} and return 0; $installed{$src} = 1; @@ -286,6 +279,13 @@ sub install_package { return 1; }; + # install all dependencies + foreach my $dep (@{$pkg->{depends}}, @{$pkg->{builddepends}}) { + next if $dep =~ /@/; + $dep =~ s/^\+//; + install_package($feed, $dep) == 0 or $ret = 1; + } + return $ret; } -- 2.35.1