diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2013-05-29 18:17:07 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2013-05-29 18:17:07 +0000 |
commit | 018abd325ee0be57be149cf930c210b5a6a35800 (patch) | |
tree | 8a466ad86bf63802603c0d10b5240a561630994c /scripts | |
parent | 95dbacb74f7358024fa5d261c630613d8e331955 (diff) | |
download | upstream-018abd325ee0be57be149cf930c210b5a6a35800.tar.gz upstream-018abd325ee0be57be149cf930c210b5a6a35800.tar.bz2 upstream-018abd325ee0be57be149cf930c210b5a6a35800.zip |
feeds: fix check for core packages that are not in the package/ toplevel directory
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36763 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/feeds | 11 |
1 files changed, 10 insertions, 1 deletions
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; }; |