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-a3cf2f4a3e73master
parent
e3ec9ee18c
commit
6e64b74230
|
@ -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