KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feeds: fix check for core packages that are not in the package/ toplevel directory

Browse source 
SVN-Revision: 36763
This commit is contained in:
Jo-Philipp Wich 2013-05-29 18:17:07 +00:00
parent 56a3396bf2
commit 103b69e250
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/feeds
View file

@ -333,6 +333,15 @@ sub lookup_package($$) {
return; return;
} }
sub is_core_package($) {
my $package = shift;
foreach my $file ("tmp/info/.packageinfo-$package", glob("tmp/info/.packageinfo-*_$package")) {
next unless index($file, "tmp/info/.packageinfo-feeds_");
return 1 if -s $file;
}
return 0;
}
sub install_package { sub install_package {
my $feed = shift; my $feed = shift;
my $name = shift; my $name = shift;
@ -342,7 +351,7 @@ sub install_package {
$feed or do { $feed or do {
$installed{$name} and return 0; $installed{$name} and return 0;
# TODO: check if it's already installed within ./package directory # TODO: check if it's already installed within ./package directory
$feed_src->{$name} or -d "./package/$name" or warn "WARNING: No feed for package '$name' found, maybe it's already part of the standard packages?\n"; $feed_src->{$name} or is_core_package($name) or warn "WARNING: No feed for package '$name' found, maybe it's already part of the standard packages?\n";
return 0; return 0;
}; };