mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-11-05 22:19:32 +01:00
install dependencies after installing package to avoid deep recursion and mass memory consuption
SVN-Revision: 10823
This commit is contained in:
parent
0dd8c59f10
commit
c7b3dff10c
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user