X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=scripts%2Ffeeds;h=383a0d80d90bac2779e736548d960340000377fe;hb=c724c76f65c6e22845081512ca72ff85e8739824;hp=b1bdee597ea0f2e1a8c5da5553bd9064737cb949;hpb=3df534502c449850bdae6c7311180d112dc2f982;p=openwrt%2Fstaging%2Fyousong.git

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;
 	};