mirror of https://github.com/hak5/openwrt-owl.git
install dependencies after installing package to avoid deep recursion and mass memory consuption
SVN-Revision: 10823owl
parent
0dd8c59f10
commit
c7b3dff10c
|
@ -264,13 +264,6 @@ sub install_package {
|
||||||
# newly installed packages set the source package
|
# newly installed packages set the source package
|
||||||
$installed{$src} and return 0;
|
$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
|
# check previously installed packages
|
||||||
$installed{$name} and return 0;
|
$installed{$name} and return 0;
|
||||||
$installed{$src} = 1;
|
$installed{$src} = 1;
|
||||||
|
@ -286,6 +279,13 @@ sub install_package {
|
||||||
return 1;
|
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;
|
return $ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue