feeds: fix check for core packages that are not in the package/ toplevel directory
SVN-Revision: 36763
This commit is contained in:
parent
56a3396bf2
commit
103b69e250
1 changed files with 10 additions and 1 deletions
|
@ -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;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue