X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=scripts%2Ffeeds;h=43c5c6dc43d2e691c0ee283b6651808d58a46ea4;hp=f272e130968b764804bd22f4d96aee68a49878c2;hb=188acd5011d99cb145a8b7836dab4179f5c0a61d;hpb=a4c0e33871757d20289e997c3ca346835298ece4 diff --git a/scripts/feeds b/scripts/feeds index f272e13096..43c5c6dc43 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -221,7 +221,7 @@ sub list_feed { my $feed = shift; get_feed($feed); - foreach my $name (sort { lc($a) cmp lc($b) } keys %package) { + foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_package) { my $pkg = $feed_package->{$name}; next if $pkg->{vdepends}; if($pkg->{name}) { @@ -397,11 +397,12 @@ sub install { if (!defined($opts{p}) or $opts{p} eq $f->[1]) { printf "Installing all packages from feed %s.\n", $f->[1]; get_feed($f->[1]); - foreach my $name (sort { lc($a) cmp lc($b) } keys %package) { + foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_package) { my $p = $feed_package->{$name}; next if $p->{vdepends}; if( $p->{name} ) { install_package($feed, $p->{name}) == 0 or $ret = 1; + get_feed($f->[1]); } } }