From 103b69e2500dc0f504c78c6f4b8881461b051965 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 29 May 2013 18:17:07 +0000
Subject: [PATCH] feeds: fix check for core packages that are not in the
package/ toplevel directory
SVN-Revision: 36763
---
scripts/feeds | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/scripts/feeds b/scripts/feeds
index b1bdee597e..383a0d80d9 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -333,6 +333,15 @@ sub lookup_package($$) {
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 {
my $feed = shift;
my $name = shift;
@@ -342,7 +351,7 @@ sub install_package {
$feed or do {
$installed{$name} and return 0;
# 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;
};
--
GitLab